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

Fixes for IRIX kernel oplocks and systems that don't have nss.h

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent b737c784e3
commit 711f15ac23
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/configure vendored
View File

@ -2578,7 +2578,7 @@ else
fi
done
for ac_hdr in sys/security.h security/pam_appl.h
for ac_hdr in nss.h sys/security.h security/pam_appl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

2
source/configure.in
View File

@ -201,7 +201,7 @@ case "$host_os" in
;;
esac
AC_CHECK_HEADERS(shadow.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
AC_CHECK_HEADERS(sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(nss.h sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(stropts.h poll.h readline.h history.h readline/readline.h)
AC_CHECK_HEADERS(readline/history.h sys/capability.h syscall.h sys/syscall.h)
AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h glob.h)

3
source/include/config.h.in
View File

@ -723,6 +723,9 @@
/* Define if you have the <netinet/tcp.h> header file. */
#undef HAVE_NETINET_TCP_H
/* Define if you have the <nss.h> header file. */
#undef HAVE_NSS_H
/* Define if you have the <poll.h> header file. */
#undef HAVE_POLL_H

10
source/nsswitch/winbind_nss_config.h
View File

@ -59,7 +59,17 @@
#include <sys/stat.h>
#include <errno.h>
#include <pwd.h>
#ifdef HAVE_NSS_H
#include <nss.h>
#else
/* Minimal needed to compile.. */
enum nss_status {
NSS_STATUS_SUCCESS,
NSS_STATUS_NOTFOUND,
NSS_STATUS_UNAVAIL
};
#endif
/* I'm trying really hard not to include anything from smb.h with the
result of some silly looking redeclaration of structures. */

2
source/smbd/oplock_irix.c
View File

@ -26,7 +26,6 @@
#if HAVE_KERNEL_OPLOCKS_IRIX
extern int DEBUGLEVEL;
static int oplock_pipe_write = -1;
static int oplock_pipe_read = -1;
@ -93,6 +92,7 @@ Disabling kernel oplock support.\n", strerror(errno) ));
****************************************************************************/
static BOOL irix_oplock_receive_message(fd_set *fds, char *buffer, int buffer_len)
{
extern int smb_read_error;
oplock_stat_t os;
SMB_DEV_T dev;
SMB_INO_T inode;