aboutsummaryrefslogtreecommitdiff
path: root/nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis')
-rw-r--r--nis/nis_cache.c94
-rw-r--r--nis/nis_cache2.h93
-rw-r--r--nis/nis_cache2_xdr.c43
-rw-r--r--nis/nss_compat/compat-grp.c50
-rw-r--r--nis/nss_compat/compat-pwd.c50
-rw-r--r--nis/nss_compat/compat-spwd.c26
-rw-r--r--nis/ypclnt.c4
7 files changed, 292 insertions, 68 deletions
diff --git a/nis/nis_cache.c b/nis/nis_cache.c
new file mode 100644
index 0000000000..a0e1130077
--- /dev/null
+++ b/nis/nis_cache.c
@@ -0,0 +1,94 @@
+/* Copyright (c) 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
+
+ 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. */
+
+#include <rpcsvc/nis.h>
+#include "nis_intern.h"
+
+#include "nis_cache2.h"
+
+static struct timeval TIMEOUT = { 25, 0 };
+
+directory_obj *
+__nis_cache_search (const_nis_name name, u_long flags, cache2_info *cinfo)
+{
+ XDR xdrs;
+ CLIENT *clnt;
+ struct sockaddr_in clnt_saddr;
+ directory_obj *obj = NULL;
+ fs_result fsres;
+ int clnt_sock;
+
+ cinfo->server_used = -1;
+ cinfo->current_ep = -1;
+ cinfo->class = -1;
+
+ memset (&clnt_saddr, '\0', sizeof clnt_saddr);
+ clnt_saddr.sin_family = AF_INET;
+ clnt_saddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+ clnt_sock = RPC_ANYSOCK;
+ clnt = clnttcp_create (&clnt_saddr, CACHEPROG, CACHE_VER_1,
+ &clnt_sock, 0, 0);
+ if (clnt == NULL)
+ return NULL;
+
+ memset (&fsres, 0, sizeof (fsres));
+ if (flags & MASTER_ONLY)
+ {
+ if (clnt_call (clnt, NIS_CACHE_FIND_MASTER, (xdrproc_t) xdr_wrapstring,
+ (caddr_t) &name, (xdrproc_t) xdr_fs_result,
+ (caddr_t) &fsres, TIMEOUT) != RPC_SUCCESS)
+ {
+ clnt_destroy (clnt);
+ close (clnt_sock);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (clnt_call (clnt, NIS_CACHE_FIND_SERVER, (xdrproc_t) xdr_wrapstring,
+ (caddr_t) &name, (xdrproc_t) xdr_fs_result,
+ (caddr_t) &fsres, TIMEOUT) != RPC_SUCCESS)
+ {
+ clnt_destroy (clnt);
+ close (clnt_sock);
+ return NULL;
+ }
+ }
+
+ clnt_destroy (clnt);
+ close (clnt_sock);
+
+ if (fsres.status != NIS_SUCCESS)
+ return NULL;
+
+ obj = calloc (1, sizeof (directory_obj));
+ if (obj == NULL)
+ return NULL;
+
+ xdrmem_create (&xdrs, fsres.dir_data.dir_data_val,
+ fsres.dir_data.dir_data_len, XDR_DECODE);
+ xdr_directory_obj (&xdrs, obj);
+ xdr_destroy (&xdrs);
+
+ cinfo->server_used = fsres.server_used;
+ cinfo->current_ep = fsres.current_ep;
+ cinfo->class = fsres.class;
+
+ return obj;
+}
diff --git a/nis/nis_cache2.h b/nis/nis_cache2.h
new file mode 100644
index 0000000000..55f0109d46
--- /dev/null
+++ b/nis/nis_cache2.h
@@ -0,0 +1,93 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#ifndef _NIS_CACHE2_H_RPCGEN
+#define _NIS_CACHE2_H_RPCGEN
+
+#include <rpc/rpc.h>
+
+#include <rpcsvc/nis.h>
+
+struct fs_result {
+ nis_error status;
+ long class;
+ struct {
+ u_int dir_data_len;
+ char *dir_data_val;
+ } dir_data;
+ long server_used;
+ long current_ep;
+};
+typedef struct fs_result fs_result;
+#ifdef __cplusplus
+extern "C" bool_t xdr_fs_result(XDR *, fs_result*);
+#elif __STDC__
+extern bool_t xdr_fs_result(XDR *, fs_result*);
+#else /* Old Style C */
+bool_t xdr_fs_result();
+#endif /* Old Style C */
+
+
+struct fs_request {
+ nis_name name;
+ long old_class;
+};
+typedef struct fs_request fs_request;
+#ifdef __cplusplus
+extern "C" bool_t xdr_fs_request(XDR *, fs_request*);
+#elif __STDC__
+extern bool_t xdr_fs_request(XDR *, fs_request*);
+#else /* Old Style C */
+bool_t xdr_fs_request();
+#endif /* Old Style C */
+
+
+#define CACHEPROG ((u_long)600100301)
+#define CACHE_VER_1 ((u_long)1)
+
+#ifdef __cplusplus
+#define NIS_CACHE_READ_COLDSTART ((u_long)1)
+extern "C" void * nis_cache_read_coldstart_1(void *, CLIENT *);
+extern "C" void * nis_cache_read_coldstart_1_svc(void *, struct svc_req *);
+#define NIS_CACHE_FIND_MASTER ((u_long)2)
+extern "C" fs_result * nis_cache_find_master_1(char **, CLIENT *);
+extern "C" fs_result * nis_cache_find_master_1_svc(char **, struct svc_req *);
+#define NIS_CACHE_FIND_SERVER ((u_long)3)
+extern "C" fs_result * nis_cache_find_server_1(char **, CLIENT *);
+extern "C" fs_result * nis_cache_find_server_1_svc(char **, struct svc_req *);
+#define NIS_CACHE_NEXT_SERVER ((u_long)4)
+extern "C" fs_result * nis_cache_next_server_1(fs_request *, CLIENT *);
+extern "C" fs_result * nis_cache_next_server_1_svc(fs_request *, struct svc_req *);
+
+#elif __STDC__
+#define NIS_CACHE_READ_COLDSTART ((u_long)1)
+extern void * nis_cache_read_coldstart_1(void *, CLIENT *);
+extern void * nis_cache_read_coldstart_1_svc(void *, struct svc_req *);
+#define NIS_CACHE_FIND_MASTER ((u_long)2)
+extern fs_result * nis_cache_find_master_1(char **, CLIENT *);
+extern fs_result * nis_cache_find_master_1_svc(char **, struct svc_req *);
+#define NIS_CACHE_FIND_SERVER ((u_long)3)
+extern fs_result * nis_cache_find_server_1(char **, CLIENT *);
+extern fs_result * nis_cache_find_server_1_svc(char **, struct svc_req *);
+#define NIS_CACHE_NEXT_SERVER ((u_long)4)
+extern fs_result * nis_cache_next_server_1(fs_request *, CLIENT *);
+extern fs_result * nis_cache_next_server_1_svc(fs_request *, struct svc_req *);
+
+#else /* Old Style C */
+#define NIS_CACHE_READ_COLDSTART ((u_long)1)
+extern void * nis_cache_read_coldstart_1();
+extern void * nis_cache_read_coldstart_1_svc();
+#define NIS_CACHE_FIND_MASTER ((u_long)2)
+extern fs_result * nis_cache_find_master_1();
+extern fs_result * nis_cache_find_master_1_svc();
+#define NIS_CACHE_FIND_SERVER ((u_long)3)
+extern fs_result * nis_cache_find_server_1();
+extern fs_result * nis_cache_find_server_1_svc();
+#define NIS_CACHE_NEXT_SERVER ((u_long)4)
+extern fs_result * nis_cache_next_server_1();
+extern fs_result * nis_cache_next_server_1_svc();
+#endif /* Old Style C */
+
+#endif /* !_NIS_CACHE2_H_RPCGEN */
diff --git a/nis/nis_cache2_xdr.c b/nis/nis_cache2_xdr.c
new file mode 100644
index 0000000000..b988f3f973
--- /dev/null
+++ b/nis/nis_cache2_xdr.c
@@ -0,0 +1,43 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+
+#include "nis_cache2.h"
+#include <rpcsvc/nis.h>
+
+bool_t
+xdr_fs_result(XDR *xdrs, fs_result *objp)
+{
+ if (!xdr_nis_error(xdrs, &objp->status)) {
+ return FALSE;
+ }
+ if (!xdr_long(xdrs, &objp->class)) {
+ return FALSE;
+ }
+ if (!xdr_bytes(xdrs, (char **)&objp->dir_data.dir_data_val, (u_int *)&objp->dir_data.dir_data_len, ~0)) {
+ return FALSE;
+ }
+ if (!xdr_long(xdrs, &objp->server_used)) {
+ return FALSE;
+ }
+ if (!xdr_long(xdrs, &objp->current_ep)) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+bool_t
+xdr_fs_request(XDR *xdrs, fs_request *objp)
+{
+ if (!xdr_nis_name(xdrs, &objp->name)) {
+ return FALSE;
+ }
+ if (!xdr_long(xdrs, &objp->old_class)) {
+ return FALSE;
+ }
+ return TRUE;
+}
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index 4b873d6915..dab1b5e566 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
@@ -458,17 +458,15 @@ getgrent_next_file (struct group *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
+ return NSS_STATUS_NOTFOUND;
+ if (p == NULL || buffer[buflen - 1] != '\xff')
{
- if (feof (ent->stream))
- return NSS_STATUS_NOTFOUND;
- else
- {
- fsetpos (ent->stream, &pos);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
/* Terminate the line for any case. */
@@ -600,17 +598,15 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
+ return NSS_STATUS_NOTFOUND;
+ if (p == NULL || buffer[buflen - 1] != '\xff')
{
- if (feof (ent->stream))
- return NSS_STATUS_NOTFOUND;
- else
- {
- fsetpos (ent->stream, &pos);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
/* Terminate the line for any case. */
@@ -794,17 +790,15 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
+ return NSS_STATUS_NOTFOUND;
+ if (p == NULL || buffer[buflen - 1] != '\xff')
{
- if (feof (ent->stream))
- return NSS_STATUS_NOTFOUND;
- else
- {
- fsetpos (ent->stream, &pos);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
/* Terminate the line for any case. */
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 8a1c424628..5bfff17ca5 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
@@ -810,17 +810,15 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
+ return NSS_STATUS_NOTFOUND;
+ if (p == NULL || buffer[buflen - 1] != '\xff')
{
- if (feof (ent->stream))
- return NSS_STATUS_NOTFOUND;
- else
- {
- fsetpos (ent->stream, &pos);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
/* Terminate the line for any case. */
@@ -1023,17 +1021,15 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
+ return NSS_STATUS_NOTFOUND;
+ if (p == NULL || buffer[buflen - 1] != '\xff')
{
- if (feof (ent->stream))
- return NSS_STATUS_NOTFOUND;
- else
- {
- fsetpos (ent->stream, &pos);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
/* Terminate the line for any case. */
@@ -1306,17 +1302,15 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
+ return NSS_STATUS_NOTFOUND;
+ if (p == NULL || buffer[buflen - 1] != '\xff')
{
- if (feof (ent->stream))
- return NSS_STATUS_NOTFOUND;
- else
- {
- fsetpos (ent->stream, &pos);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
/* Terminate the line for any case. */
diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index 83db85620e..816e9c1f0a 100644
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
@@ -761,12 +761,16 @@ getspent_next_file (struct spwd *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
return NSS_STATUS_NOTFOUND;
-
- /* Terminate the line for any case. */
- buffer[buflen - 1] = '\0';
+ if (p == NULL || buffer[buflen - 1] != '\xff')
+ {
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
/* Skip leading blanks. */
while (isspace (*p))
@@ -965,12 +969,16 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
do
{
fgetpos (ent->stream, &pos);
+ buffer[buflen - 1] = '\xff';
p = fgets (buffer, buflen, ent->stream);
- if (p == NULL)
+ if (p == NULL && feof (ent->stream))
return NSS_STATUS_NOTFOUND;
-
- /* Terminate the line for any case. */
- buffer[buflen - 1] = '\0';
+ if (p == NULL || buffer[buflen - 1] != '\xff')
+ {
+ fsetpos (ent->stream, &pos);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
/* Skip leading blanks. */
while (isspace (*p))
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index f07f0c6f82..c661ee3262 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
@@ -78,8 +78,6 @@ __yp_bind (const char *domain, dom_binding **ypdb)
ysd->dom_socket = -1;
ysd->dom_vers = -1;
}
- else
- ysd->dom_client = NULL;
try = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 21:18:53 +0000