sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

include: Create system/nis.h in libreplace

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13238

Pair-Programmed-With: Guenther Deschner <gd@samba.org>

Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
Andreas Schneider 2018-01-19 09:33:21 +01:00 committed by Andreas Schneider
parent ca5eaf0cdc
commit c29d087e1e
5 changed files with 114 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
lib/replace/system/nis.h Normal file
View File

@ -0,0 +1,83 @@
/*
Unix SMB/CIFS implementation.
nis system include wrappers
Copyright (C) Andrew Tridgell 2004
** NOTE! The following LGPL license applies to the replace
** library. This does NOT imply that all of Samba is released
** under the LGPL
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _nis_passwd_h
#define _nis_passwd_h
#if defined(HAVE_RPC_RPC_H)
/*
* Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h.
*/
#if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT)
#undef AUTH_ERROR
#endif /* HAVE_SYS_SECURITY_H && HAVE_RPC_AUTH_ERROR_CONFLICT */
/*
* HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
* was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
* them again without checking if they already exsist. This generates
* two "Redefinition of macro" warnings for every single .c file that is
* compiled.
*/
#if defined(HPUX) && defined(TCP_NODELAY)
#undef TCP_NODELAY
#endif /* HPUX && TCP_NODELAY */
#if defined(HPUX) && defined(TCP_MAXSEG)
#undef TCP_MAXSEG
#endif /* HPUX && TCP_MAXSEG */
#include <rpc/rpc.h>
#endif /* HAVE_RPC_RPC_H */
#if defined (HAVE_NETGROUP)
#if defined(HAVE_RPCSVC_YP_PROT_H)
/*
* HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
* was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
* them again without checking if they already exsist. This generates
* two "Redefinition of macro" warnings for every single .c file that is
* compiled.
*/
#if defined(HPUX) && defined(TCP_NODELAY)
#undef TCP_NODELAY
#endif /* HPUX && TCP_MAXSEG */
#if defined(HPUX) && defined(TCP_MAXSEG)
#undef TCP_MAXSEG
#endif /* HPUX && TCP_MAXSEG */
#include <rpcsvc/yp_prot.h>
#endif /* HAVE_RPCSVC_YP_PROT_H */
#if defined(HAVE_RPCSVC_YPCLNT_H)
#include <rpcsvc/ypclnt.h>
#endif /* HAVE_RPCSVC_YPCLNT_H */
#endif /* HAVE_NETGROUP */
#endif /* _nis_passwd_h */

10
lib/util/access.c
View File

@ -22,6 +22,10 @@
#include "lib/util/access.h"
#include "lib/util/unix_match.h"
#if defined(HAVE_NETGROUP)
#include "system/nis.h"
#endif
#define NAME_INDEX 0
#define ADDR_INDEX 1
@ -143,11 +147,11 @@ static bool string_match(const char *tok,const char *s)
netgroup_ok = innetgr(tok + 1, hostname, (char *) 0, mydomain);
DEBUG(5,("looking for %s of domain %s in netgroup %s gave %s\n",
DBG_INFO("%s %s of domain %s in netgroup %s\n",
netgroup_ok ? "Found" : "Could not find",
hostname,
mydomain?mydomain:"(ANY)",
tok+1,
BOOLSTR(netgroup_ok)));
tok+1);
SAFE_FREE(hostname);

13
source3/auth/user_util.c
View File

@ -23,6 +23,19 @@
#include "system/filesys.h"
#include "auth.h"
#ifdef HAVE_NETGROUP
/* rpc/xdr.h uses TRUE and FALSE */
#ifdef TRUE
#undef TRUE
#endif
#ifdef FALSE
#undef FALSE
#endif
#include "system/nis.h"
#endif
/*******************************************************************
Map a username from a dos name to a unix name by looking in the username
map. Note that this modifies the name in place.

45
source3/include/includes.h
View File

@ -68,51 +68,6 @@
#include "system/time.h"
#include "system/wait.h"
#if defined(HAVE_RPC_RPC_H)
/*
* Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h.
*/
#if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT)
#undef AUTH_ERROR
#endif
/*
* HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
* was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
* them again without checking if they already exsist. This generates
* two "Redefinition of macro" warnings for every single .c file that is
* compiled.
*/
#if defined(HPUX) && defined(TCP_NODELAY)
#undef TCP_NODELAY
#endif
#if defined(HPUX) && defined(TCP_MAXSEG)
#undef TCP_MAXSEG
#endif
#include <rpc/rpc.h>
#endif
#if defined (HAVE_NETGROUP)
#if defined(HAVE_RPCSVC_YP_PROT_H)
/*
* HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
* was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
* them again without checking if they already exsist. This generates
* two "Redefinition of macro" warnings for every single .c file that is
* compiled.
*/
#if defined(HPUX) && defined(TCP_NODELAY)
#undef TCP_NODELAY
#endif
#if defined(HPUX) && defined(TCP_MAXSEG)
#undef TCP_MAXSEG
#endif
#include <rpcsvc/yp_prot.h>
#endif
#if defined(HAVE_RPCSVC_YPCLNT_H)
#include <rpcsvc/ypclnt.h>
#endif
#endif /* HAVE_NETGROUP */
#ifndef HAVE_KRB5_H
#undef HAVE_KRB5
#endif

11
source3/lib/util.c
View File

@ -45,6 +45,17 @@
#define MAX_ALLOC_SIZE (1024*1024*256)
#if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
/* rpc/xdr.h uses TRUE and FALSE */
#ifdef TRUE
#undef TRUE
#endif
#ifdef FALSE
#undef FALSE
#endif
#include "system/nis.h"
#ifdef WITH_NISPLUS_HOME
#ifdef BROKEN_NISPLUS_INCLUDE_FILES
/*