sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Added OSF1 changes to HEAD (-lsecurity etc.)

Browse Source 
groupdb/groupdb.c: Fixed compile error caught by IRIX compiler.
utils/smbpasswd.c: Fixed SunOS optind, optarg problem.
Jeremy.
(This used to be commit 30af39ae1e)
This commit is contained in:
Jeremy Allison 1998-11-18 22:04:24 +00:00
parent bb9622bfa6
commit 9579b98237
7 changed files with 243 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/acconfig.h
View File

@ -48,6 +48,7 @@
#undef HAVE_NETMASK_IFREQ
#undef HAVE_NETMASK_AIX
#undef HAVE_CRYPT
#undef HAVE_PUTPRPWNAM
#undef WITH_MMAP
#undef WITH_SYSLOG
#undef WITH_SSL

327
source3/configure vendored
View File

File diff suppressed because it is too large Load Diff

31
source3/configure.in
View File

@ -29,8 +29,8 @@ AC_HEADER_DIRENT
AC_HEADER_TIME
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h)
AC_CHECK_HEADERS(compat.h rpc/rpc.h rpc/types.h rpc/xdr.h rpc/auth.h )
AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/route.h net/if.h)
AC_CHECK_HEADERS(compat.h rpc/rpc.h rpc/types.h rpc/xdr.h rpc/auth.h rpc/clnt.h)
AC_CHECK_HEADERS(rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ctype.h )
AC_CHECK_HEADERS(sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h)
AC_CHECK_HEADERS(sys/filio.h string.h strings.h stdlib.h sys/socket.h)
@ -190,6 +190,11 @@ AC_CHECK_FUNCS(pread _pread __pread pread64 _pread64 __pread64)
AC_CHECK_FUNCS(pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64)
AC_CHECK_FUNCS(open64 _open64 __open64 creat64)
if test x"$ac_cv_func_putprpwnam" = x"no"; then
AC_CHECK_LIB(security, putprpwnam, [LIBS="$LIBS -lsecurity";
AC_DEFINE(HAVE_PUTPRPWNAM)])
fi
# this bit needs to be modified for each OS that is suported by
# smbwrapper. You need to specify how to created a shared library and
# how to compile C code to produce PIC object files
@ -397,6 +402,28 @@ if test x"$samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" = x"yes"; then
AC_DEFINE(HAVE_IRIX_SPECIFIC_CAPABILITIES)
fi
AC_CACHE_CHECK([for broken int32 typedef included by rpc/rpc.h],samba_cv_HAVE_BROKEN_INT32_FROM_RPC_RPC_H,[
AC_TRY_COMPILE([#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
#include <rpc/rpc.h>
#endif],
[#define int32 int],
samba_cv_HAVE_BROKEN_INT32_FROM_RPC_RPC_H=yes,samba_cv_HAVE_BROKEN_INT32_FROM_RPC_RPC_H=no)])
if test x"$samba_cv_HAVE_BROKEN_INT32_FROM_RPC_RPC_H" = x"yes"; then
AC_DEFINE(HAVE_BROKEN_INT32_FROM_RPC_RPC_H)
fi
AC_CACHE_CHECK([for broken uint32 typedef included by rpc/rpc.h],samba_cv_HAVE_BROKEN_UINT32_FROM_RPC_RPC_H,[
AC_TRY_COMPILE([#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
#include <rpc/rpc.h>
#endif],
[#define uint32 unsigned int],
samba_cv_HAVE_BROKEN_UINT32_FROM_RPC_RPC_H=yes,samba_cv_HAVE_BROKEN_UINT32_FROM_RPC_RPC_H=no)])
if test x"$samba_cv_HAVE_BROKEN_UINT32_FROM_RPC_RPC_H" = x"yes"; then
AC_DEFINE(HAVE_BROKEN_UINT32_FROM_RPC_RPC_H)
fi
AC_MSG_CHECKING([for test routines])
AC_TRY_RUN([#include "${srcdir-.}/tests/trivial.c"],
AC_MSG_RESULT(yes),

8
source3/groupdb/groupdb.c
View File

@ -187,14 +187,14 @@ static BOOL user_is_member(char *user_name, DOMAIN_GRP_MEMBER *mem, int num_mem)
*************************************************************************/
BOOL iterate_getusergroupsnam(char *user_name, DOMAIN_GRP **grps, int *num_grps)
{
DOMAIN_GRP *grp;
DOMAIN_GRP *grp = NULL;
DOMAIN_GRP_MEMBER *mem = NULL;
int num_mem = 0;
void *fp = NULL;
DEBUG(10, ("search for usergroups by name: %s\n", user_name));
if (user_name == NULL || grp == NULL || num_grps == NULL)
if (user_name == NULL || grps == NULL || num_grps == NULL)
{
return False;
}
@ -250,12 +250,12 @@ BOOL iterate_getusergroupsnam(char *user_name, DOMAIN_GRP **grps, int *num_grps)
*************************************************************************/
BOOL enumdomgroups(DOMAIN_GRP **grps, int *num_grps)
{
DOMAIN_GRP *grp;
DOMAIN_GRP *grp = NULL;
void *fp = NULL;
DEBUG(10, ("enum user groups\n"));
if (grp == NULL || num_grps == NULL)
if (grps == NULL || num_grps == NULL)
{
return False;
}

7
source3/include/config.h.in
View File

@ -105,6 +105,7 @@
#undef HAVE_NETMASK_IFREQ
#undef HAVE_NETMASK_AIX
#undef HAVE_CRYPT
#undef HAVE_PUTPRPWNAM
#undef WITH_MMAP
#undef WITH_SYSLOG
#undef WITH_SSL
@ -630,6 +631,9 @@
/* Define if you have the <net/if.h> header file. */
#undef HAVE_NET_IF_H
/* Define if you have the <net/route.h> header file. */
#undef HAVE_NET_ROUTE_H
/* Define if you have the <netinet/tcp.h> header file. */
#undef HAVE_NETINET_TCP_H
@ -648,6 +652,9 @@
/* Define if you have the <rpc/auth.h> header file. */
#undef HAVE_RPC_AUTH_H
/* Define if you have the <rpc/clnt.h> header file. */
#undef HAVE_RPC_CLNT_H
/* Define if you have the <rpc/rpc.h> header file. */
#undef HAVE_RPC_RPC_H

9
source3/include/includes.h
View File

@ -216,6 +216,15 @@
#include <sys/sem.h>
#endif
/*
* Seems to be needed by some OS's that complain
* about struct rtentry not being defined.
*/
#ifdef HAVE_NET_ROUTE_H
#include <net/route.h>
#endif
#ifdef HAVE_NET_IF_H
#include <net/if.h>
#endif

18
source3/utils/smbpasswd.c
View File

@ -23,6 +23,12 @@ extern pstring myhostname;
extern pstring global_myname;
extern int DEBUGLEVEL;
/*
* Next two lines needed for SunOS and don't
* hurt anything else...
*/
extern char *optarg;
extern int optind;
/*********************************************************
a strdup with exit
@ -254,12 +260,6 @@ handle password changing for root
*************************************************************/
static int process_root(int argc, char *argv[])
{
/*
* Next two lines needed for SunOS and don't
* hurt anything else...
*/
extern char *optarg;
extern int optind;
struct passwd *pwd;
int ch;
BOOL joining_domain = False;
@ -449,12 +449,6 @@ handle password changing for non-root
*************************************************************/
static int process_nonroot(int argc, char *argv[])
{
/*
* Next two lines needed for SunOS and don't
* hurt anything else...
*/
extern char *optarg;
extern int optind;
struct passwd *pwd = NULL;
int ch;
BOOL stdin_passwd_get = False;