From 0e8fd3398771da2f016d72830179507f3edda51b Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Sat, 4 May 1996 07:50:46 +0000 Subject: Initial version imported to CVS (This used to be commit 291551d80711daab7b7581720bcd9a08d6096517) --- source3/include/includes.h | 1154 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1154 insertions(+) create mode 100644 source3/include/includes.h (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h new file mode 100644 index 0000000000..cc2bbbfad7 --- /dev/null +++ b/source3/include/includes.h @@ -0,0 +1,1154 @@ +#ifndef _INCLUDES_H +#define _INCLUDES_H +/* + Unix SMB/Netbios implementation. + Version 1.9. + Machine customisation and include handling + Copyright (C) Andrew Tridgell 1994-1995 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* + This file does all the #includes's. This makes it easier to + port to a new unix. Hopefully a port will only have to edit the Makefile + and add a section for the new unix below. +*/ + + +/* the first OS dependent section is to setup what includes will be used. + the main OS dependent section comes later on +*/ + +#ifdef ALTOS +#define NO_UTIMEH +#endif + +#ifdef MIPS +#define POSIX_H +#define NO_UTIMEH +#endif + +#ifdef sun386 +#define NO_UTIMEH +#endif + +#ifdef NEXT2 +#define NO_UTIMEH +#endif + +#ifdef NEXT3_0 +#define NO_UTIMEH +#define NO_UNISTDH +#endif + +#ifdef APOLLO +#define NO_UTIMEH +#define NO_SYSMOUNTH +#define NO_UNISTDH +#endif + +#ifdef AIX +#define NO_SYSMOUNTH +#endif + +#ifdef M88K_R3 +#define SVR3H +#define NO_RESOURCEH +#endif + +#ifdef DNIX +#define NO_SYSMOUNTH +#define NO_NETIFH +#define NO_RESOURCEH +#define PRIME_NMBD 0 +#define NO_SETGROUPS +#endif + + +#ifdef ISC +#define SYSSTREAMH +#define NO_RESOURCEH +#endif + +#ifdef QNX +#define NO_RESOURCEH +#define NO_SYSMOUNTH +#define USE_MMAP 1 +#ifdef __386__ + #define __i386__ +#endif +#endif + +#ifdef NEWS42 +#define NO_UTIMEH +#define NO_STRFTIME +#define NO_UTIMBUF +#define REPLACE_MKTIME +#define NO_TM_NAME +#endif + +#ifdef OS2 +#define NO_SYSMOUNTH +#define NO_NETIFH +#endif + +#ifdef LYNX +#define NO_SYSMOUNTH +#endif + + +#if (defined(SHADOW_PWD)||defined(OSF1_ENH_SEC)||defined(SecureWare)||defined(PWDAUTH)) +#define PASSWORD_LENGTH 16 +#endif + +/* here is the general includes section - with some ifdefs generated + by the previous section +*/ +#include "local.h" +#include +#ifdef POSIX_STDLIBH +#include +#else +#include +#endif +#include +#include +#ifndef NO_UTIMEH +#include +#endif +#include + +#ifdef SVR3H +#include +#include +#include +#include +#include +#endif + +#include +#include +#include +#ifdef POSIX_H +#include +#include +#include +#else +#include +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#ifndef NO_RESOURCEH +#include +#endif +#ifndef NO_SYSMOUNTH +#include +#endif +#include +#ifdef __STDC__ +#include +#else +#include +#endif +#ifndef NO_UNISTDH +#include +#endif +#include +#ifdef SYSSTREAMH +#include +#endif +#ifndef NO_NETIFH +#ifdef POSIX_H +#include +#else +#include +#endif +#endif + +#if USE_MMAP +#include +#endif + +#if defined(GETPWANAM) +#include +#include +#include +#include +#endif + +#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(CONVEX) +#include +#endif + +/* this might be different on different systems */ +#ifdef QUOTAS +#ifdef LINUX +#ifdef __KERNEL__ +#undef __KERNEL__ +#include +#define __KERNEL__ +#else +#include +#endif +#include +#else +#include +#ifndef CRAY +#include +#else +#include +#endif +#endif +#endif + +#ifdef SYSLOG +#include +#endif + + + +/*************************************************************************** +Here come some platform specific sections +***************************************************************************/ + + +#ifdef LINUX +#include +#include +#include +#include +#include +#ifndef NO_ASMSIGNALH +#include +#endif +#define SIGNAL_CAST (__sighandler_t) +#define USE_GETCWD +#define USE_SETSID +#define HAVE_BZERO +#define HAVE_MEMMOVE +#ifdef SHADOW_PWD +#ifndef crypt +#define crypt pw_encrypt +#endif +#endif +#endif + +#ifdef SUNOS4 +#define SIGNAL_CAST (void (*)(int)) +#include +#include +#include +#include +#include +#include +#include +#include +/* #include */ +#ifdef sun386 +#define NO_STRFTIME +#define NO_UTIMBUF +#define mktime timelocal +typedef unsigned short mode_t; +#else +#include +#define NO_STRERROR +#endif +#define REPLACE_GETPASS +#define BSD_TERMIO +#endif + + +#ifdef SUNOS5 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +extern int gettimeofday (struct timeval *, void *); +extern int gethostname (char *name, int namelen); +extern int innetgr (const char *, const char *, const char *, const char *); +#define USE_SETVBUF +#define SIGNAL_CAST (void (*)(int)) +#ifndef SYSV +#define SYSV +#endif +#define USE_WAITPID +#define REPLACE_STRLEN +#define USE_STATVFS +#define USE_GETCWD +#define USE_SETSID +#define REPLACE_GETPASS +#endif + + +#ifdef ULTRIX +#include +#include +#include +#include +#ifdef ULTRIX_AUTH +#include +#endif +char *getwd(char *); +#define NOSTRDUP +#ifdef __STDC__ +#define SIGNAL_CAST (void(*)(int)) +#endif +#define USE_DIRECT +#endif + +#ifdef SGI +#include +#include +#include +#include +#ifndef SYSV +#define SYSV +#endif +#define SIGNAL_CAST (void (*)()) +#define STATFS4 +#define USE_WAITPID +#define USE_DIRECT +#endif + +#ifdef SGI5 +#include +#include +#include +#include +#include +#define USE_WAITPID +#define NETGROUP +#ifndef SYSV +#define SYSV +#endif +#define SIGNAL_CAST (void (*)()) +#define USE_STATVFS +#define USE_WAITPID +#endif + + +#ifdef MIPS +#include +#include +#include +#include +#include +#include +#include +#define SIGNAL_CAST (void (*)()) +typedef int mode_t; +extern struct group *getgrnam(); +extern struct passwd *getpwnam(); +#define STATFS4 +#define NO_STRERROR +#define REPLACE_STRSTR +#endif /* MIPS */ + + + +#ifdef DGUX +#include +#include +#include +#include +#include +#include +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +#define STATFS4 +#define USE_GETCWD +#endif + + +#ifdef SVR4 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +#define USE_STATVFS +#define USE_GETCWD +#define USE_SETSID +#endif + + +#ifdef OSF1 +#include +#include +#include +char *getwd(char *); +char *mktemp(char *); /* No standard include */ +#include +#include /* both for inet_ntoa */ +#define SIGNAL_CAST ( void (*) (int) ) +#define STATFS3 +#define USE_F_FSIZE +#include +#ifdef OSF1_ENH_SEC +#include +#include +#include +#include +#include +#define PASSWORD_LENGTH 16 +#define NEED_AUTH_PARAMETERS +#endif /* OSF1_ENH_SEC */ +#endif + + +#ifdef CLIX +#include +#define SIGNAL_CAST (void (*)()) +#include +#include +#include +#define NO_EID +#define USE_WAITPID +#define STATFS4 +#define NO_FSYNC +#define USE_GETCWD +#define USE_SETSID +#define REPLACE_GETPASS +#define NO_GETRLIMIT +#endif /* CLIX */ + + + +#ifdef BSDI +#include +#include +#define SIGNAL_CAST (void (*)()) +#define USE_DIRECT +#endif + + +#ifdef NETBSD +#include +#include +/* you may not need this */ +#define NO_GETSPNAM +#define SIGNAL_CAST (void (*)()) +#define USE_DIRECT +#define REPLACE_INNETGR +#endif + + + +#ifdef FreeBSD +#include +#include +#include +#include +#define SIGNAL_CAST (void (*)()) +#define USE_DIRECT +#define REPLACE_INNETGR +#endif + + + +#ifdef AIX +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)()) +#define DEFAULT_PRINTING PRINT_AIX +#endif + + +#ifdef HPUX +#include +#include +#include +#include +#include +#include +#include +#ifdef HPUX_10_TRUSTED +#include +#include +#define NEED_AUTH_PARAMETERS +#endif +#define SIGNAL_CAST (void (*)(__harg)) +#define SELECT_CAST (int *) +#define SYSV +#define USE_WAITPID +#define WAIT3_CAST2 (int *) +#define USE_GETCWD +#define USE_SETSID +#define USE_SETRES +#define DEFAULT_PRINTING PRINT_HPUX +#define SIGCLD_IGNORE +#endif + + +#ifdef SEQUENT +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define SIGNAL_CAST (void (*)(int)) +#define USE_WAITPID +#define USE_GETCWD +#define NO_EID +#define STATFS4 +#define USE_DIRECT +#endif + +#ifdef NEXT2 +#include +#include +#include +#include +#define bzero(b,len) memset(b,0,len) +#define mode_t int +#define NO_UTIMBUF +#include +#define NOSTRDUP +#define USE_DIRECT +#define USE_WAITPID +#endif + + +#ifdef NEXT3_0 +#include +#include +#include +#define bzero(b,len) memset(b,0,len) +#define NO_UTIMBUF +#include +#define NOSTRDUP +#define USE_DIRECT +#define mode_t int +#define GID_TYPE int +#define gid_t int +#define SIGNAL_CAST (void (*)(int)) +#define WAIT3_CAST1 (union wait *) +#define HAVE_GMTOFF +#endif + + + +#ifdef APOLLO +#include +#include +#include +#define NO_UTIMBUF +#define USE_DIRECT +#define USE_GETCWD +#define SIGNAL_CAST (void (*)()) +#define HAVE_FCNTL_LOCK 0 +#define HAVE_GETTIMEOFDAY +#define STATFS4 +#endif + + + +#ifdef SCO +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef EVEREST +#include +#endif +#ifdef NETGROUP +#include +#endif +#ifdef SecureWare +#include +#include +#include +#define crypt bigcrypt +#endif +#ifndef EVEREST + #define ftruncate(f,l) syscall(0x0a28,f,l) +#endif +#define SIGNAL_CAST (void (*)(int)) +#define USE_WAITPID +#define USE_GETCWD +#define USE_SETSID +#ifdef SCO3_2_2 +#define NO_EID +#else +#ifndef EVEREST +#define USE_IFREQ +#endif +#endif +#define STATFS4 +#define NO_FSYNC +#ifndef EVEREST +#define NO_INITGROUPS +#endif +#define HAVE_PATHCONF +#define NO_GETRLIMIT +#endif + + + +/* Definitions for RiscIX */ +#ifdef RiscIX +#define SIGNAL_CAST (void (*)(int)) +#include +#include +#include +#include +#include +#include +#define HAVE_GETTIMEOFDAY +#define NOSTRCASECMP +#define NOSTRDUP +#endif + + + +#ifdef ISC +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define FIONREAD FIORDCHK +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +#define USE_GETCWD +#define USE_SETSID +#define USE_IFREQ +#define NO_FTRUNCATE +#define STATFS4 +#define NO_FSYNC +#endif + + + +#ifdef AUX +#include +#include +#include +#include +#include +#include +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +char *strdup (char *); +#define USE_GETCWD +#endif + + +#ifdef M88K_R3 +#include +#include +#include +#include +#define STATFS4 +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +char *strdup (char *); +#define USE_GETCWD +#define NO_FSYNC +#define NO_EID +#endif + + +#ifdef DNIX +#include +#include +#include +#include +#include +#define NO_GET_BROADCAST +#define USE_WAITPID +#define USE_GETCWD +#define USE_SETSID +#define STATFS4 +#define NO_EID +#define PF_INET AF_INET +#define NO_STRERROR +#define ftruncate(f,l) chsize(f,l) +#endif /* DNIX */ + +#ifdef CONVEX +#define SIGNAL_CAST (void (*)(int)) +#include +#include +#include +#include +#include +#include +#define DONT_REINSTALL_SIG +#define USE_SIGBLOCK +#define USE_WAITPID +#define SIGNAL_CAST (_SigFunc_Ptr_t) +#define NO_GETSPNAM +#define HAVE_MEMMOVE +extern char *mktemp(char *); +extern int fsync(int); +extern int seteuid(uid_t); +extern int setgroups(int, int *); +extern int initgroups(char *, int); +extern int statfs(char *, struct statfs *); +extern int setegid(gid_t); +extern int getopt(int, char *const *, const char *); +extern int chroot(char *); +extern int gettimeofday(struct timeval *, struct timezone *); +extern int gethostname(char *, int); +extern char *crypt(char *, char *); +extern char *getpass(char *); +#endif + + +#ifdef CRAY +#define MAXPATHLEN 1024 +#include +#include +#include +#include +#define SIGNAL_CAST (void (*)(int)) +#define SIGCLD_IGNORE +#define HAVE_FCNTL_LOCK 1 +#define USE_SETSID +#define STATFS4 +#endif + + +#ifdef ALTOS +#include +#include +#include +#include +#include +#define const +#define uid_t int +#define gid_t int +#define mode_t int +#define ptrdiff_t int +#define HAVE_GETGRNAM 0 +#define NO_EID +#define NO_FSYNC +#define NO_FTRUNCATE +#define NO_GETRLIMIT +#define NO_INITGROUPS +#define NO_SELECT +#define NO_SETGROUPS +#define NO_STRERROR +#define NO_STRFTIME +#define NO_TM_NAME +#define NO_UTIMEH +#define NOSTRCASECMP +#define REPLACE_MKTIME +#define REPLACE_RENAME +#define REPLACE_STRSTR +#define STATFS4 +#define USE_GETCWD +#endif + +#ifdef QNX +#define STATFS4 +#include +#include +#include +#include +#define SIGNAL_CAST (void (*)()) +#define USE_WAITPID +#define NO_INITGROUPS +#define NO_SETGROUPS +#define HAVE_TIMEZONE +#define USE_GETCWD +#define USE_SETSID +#define HAVE_FCNTL_LOCK 1 +#define DEFAULT_PRINTING PRINT_QNX +#endif + + +#ifdef NEWS42 +#include +#include +#include +#include +typedef int mode_t; +#endif + +#ifdef OS2 +#include +#include +#include +#include +#define SIGNAL_CAST (void (*)()) +#define HAVE_FCNTL_LOCK 0 +#define USE_WAITPID +#define NO_GET_BROADCAST +#define NO_EID +#define NO_SETGROUPS +#define NO_INITGROUPS +#define NO_CRYPT +#define NO_STATFS +#define NO_CHROOT +#define NO_CHOWN +#define strcasecmp stricmp +#define strncasecmp strnicmp +#endif + + +#ifdef LYNX +#define SIGNAL_CAST (void (*)()) +#define WAIT3_CAST1 (union wait *) +#define STATFS4 +#include +#include +#include +#include +#include +#include +#define USE_GETCWD +#define USE_GETSID +#endif + + +/******************************************************************* +end of the platform specific sections +********************************************************************/ + +#ifdef SecureWare +#define NEED_AUTH_PARAMETERS +#endif + +#ifdef REPLACE_GETPASS +extern char *getsmbpass(char *); +#define getpass(s) getsmbpass(s) +#endif + +#ifdef REPLACE_INNETGR +#define innetgr(group,host,user,dom) InNetGr(group,host,user,dom) +#endif + +#ifndef FD_SETSIZE +#define FD_SETSIZE 255 +#endif + +#ifndef MAXINT +#define MAXINT ((((unsigned)1)<<(sizeof(int)*8-1))-1) +#endif + +#ifndef __STDC__ +#define const +#endif + +/* Now for some other grungy stuff */ +#ifdef NO_GETSPNAM +struct spwd { /* fake shadow password structure */ + char *sp_pwdp; +}; +#endif + +#ifndef HAVE_BZERO +#ifndef bzero +#define bzero(p,s) memset(p,0,s) +#endif +#endif + +#ifndef HAVE_MEMMOVE +#ifndef memmove +#define memmove(d,s,n) MemMove(d,s,n) +#endif +#endif + +#ifdef USE_DIRECT +#include +#endif + +/* some unixes have ENOTTY instead of TIOCNOTTY */ +#ifndef TIOCNOTTY +#ifdef ENOTTY +#define TIOCNOTTY ENOTTY +#endif +#endif + +#ifndef SIGHUP +#define SIGHUP 1 +#endif + +/* if undefined then use bsd or sysv printing */ +#ifndef DEFAULT_PRINTING +#ifdef SYSV +#define DEFAULT_PRINTING PRINT_SYSV +#else +#define DEFAULT_PRINTING PRINT_BSD +#endif +#endif + + +#ifdef AFS_AUTH +#include +#include +#endif + +#ifdef DFS_AUTH +#include +#include +#endif + +#ifdef NO_UTIMBUF +struct utimbuf { + time_t actime; + time_t modtime; +}; +#endif + +#ifdef NO_STRERROR +#ifndef strerror +extern char *sys_errlist[]; +#define strerror(i) sys_errlist[i] +#endif +#endif + +#ifndef perror +#define perror(m) printf("%s: %s\n",m,strerror(errno)) +#endif + +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 255 +#endif + +#include "version.h" +#include "smb.h" +#include "byteorder.h" +#ifdef SMB_PASSWD +#include "smbpass.h" +#endif + +#include "kanji.h" +#include "charset.h" + +#ifndef S_IFREG +#define S_IFREG 0100000 +#endif + +#ifndef S_ISREG +#define S_ISREG(x) ((S_IFREG & x)!=0) +#endif + +#ifndef S_ISDIR +#define S_ISDIR(x) ((S_IFDIR & x)!=0) +#endif + +#ifdef UFC_CRYPT +#define crypt ufc_crypt +#endif + +#ifdef REPLACE_STRLEN +#define strlen(s) Strlen(s) +#endif + +#ifdef REPLACE_STRSTR +#define strstr(s,p) Strstr(s,p) +#endif + +#ifdef REPLACE_MKTIME +#define mktime(t) Mktime(t) +#endif + +#ifndef NGROUPS_MAX +#define NGROUPS_MAX 128 +#endif + +#ifndef EDQUOT +#define EDQUOT ENOSPC +#endif + +#ifndef HAVE_GETGRNAM +#define HAVE_GETGRNAM 1 +#endif + +#ifndef SOL_TCP +#define SOL_TCP 6 +#endif + +/* default to using ftruncate workaround as this is safer than assuming +it works and getting lots of bug reports */ +#ifndef FTRUNCATE_CAN_EXTEND +#define FTRUNCATE_CAN_EXTEND 0 +#endif + +/* maybe this unix doesn't separate RD and WR locks? */ +#ifndef F_RDLCK +#define F_RDLCK F_WRLCK +#endif + +#ifndef ENOTSOCK +#define ENOTSOCK EINVAL +#endif + +#ifndef SIGCLD +#define SIGCLD SIGCHLD +#endif + +#ifndef HAVE_FCNTL_LOCK +#define HAVE_FCNTL_LOCK 1 +#endif + +#ifndef WAIT3_CAST2 +#define WAIT3_CAST2 (struct rusage *) +#endif + +#ifndef WAIT3_CAST1 +#define WAIT3_CAST1 (int *) +#endif + +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)()) +#endif + +/* this is a rough check to see if this machine has a lstat() call. + it is not guaranteed to work */ +#if !(defined(S_ISLNK) || defined(S_IFLNK)) +#define lstat stat +#endif + +/* Not all systems declare ERRNO in errno.h... and some systems #define it! */ +#ifndef errno +extern int errno; +#endif + + +#ifdef NO_EID +#define geteuid() getuid() +#define getegid() getgid() +#define seteuid(x) setuid(x) +#define setegid(x) setgid(x) +#endif + + +#if (HAVE_FCNTL_LOCK == 0) +/* since there is no locking available, system includes */ +/* for DomainOS 10.4 do not contain any of the following */ +/* #define's. So, to satisfy the compiler, add these */ +/* #define's, although they arn't really necessary. */ +#define F_GETLK 0 +#define F_SETLK 0 +#define F_WRLCK 0 +#define F_UNLCK 0 +#endif /* HAVE_FCNTL_LOCK == 0 */ + +#ifdef NOSTRCASECMP +#define strcasecmp(s1,s2) StrCaseCmp(s1,s2) +#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n) +#endif + +#ifndef strcpy +#define strcpy(dest,src) StrCpy(dest,src) +#endif + + +/* possibly wrap the malloc calls */ +#if WRAP_MALLOC + +/* undo the old malloc def if necessary */ +#ifdef malloc +#define xx_old_malloc malloc +#undef malloc +#endif + +#define malloc(size) malloc_wrapped(size,__FILE__,__LINE__) + +/* undo the old realloc def if necessary */ +#ifdef realloc +#define xx_old_realloc realloc +#undef realloc +#endif + +#define realloc(ptr,size) realloc_wrapped(ptr,size,__FILE__,__LINE__) + +/* undo the old free def if necessary */ +#ifdef free +#define xx_old_free free +#undef free +#endif + +#define free(ptr) free_wrapped(ptr,__FILE__,__LINE__) + +/* and the malloc prototypes */ +void *malloc_wrapped(int,char *,int); +void *realloc_wrapped(void *,int,char *,int); +void free_wrapped(void *,char *,int); + +#endif + + +#if WRAP_MEMCPY +/* undo the old memcpy def if necessary */ +#ifdef memcpy +#define xx_old_memcpy memcpy +#undef memcpy +#endif + +#define memcpy(d,s,l) memcpy_wrapped(d,s,l,__FILE__,__LINE__) +void *memcpy_wrapped(void *d,void *s,int l,char *fname,int line); +#endif + +#endif -- cgit From beee1b280f3a0f2884b78d9afa7ad1506e43e997 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Sat, 4 May 1996 10:32:30 +0000 Subject: added sequent fixes (This used to be commit 21c7f21fd59b592023c16734731f61cff6f04aee) --- source3/include/includes.h | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index cc2bbbfad7..2408b3c194 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -481,7 +481,6 @@ char *mktemp(char *); /* No standard include */ #include #define SIGNAL_CAST (void (*)()) #define USE_DIRECT -#define REPLACE_INNETGR #endif @@ -548,6 +547,32 @@ char *mktemp(char *); /* No standard include */ #define USE_DIRECT #endif +#ifdef SEQUENT_PTX4 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +#define USE_STATVFS +#define USE_GETCWD +#ifndef seteuid +#define seteuid(uid) setreuid(-1,uid) +#endif +#ifndef setegid +#define setegid(gid) setregid(-1,gid) +#endif +#endif + + #ifdef NEXT2 #include #include @@ -734,7 +759,6 @@ char *strdup (char *); #endif /* DNIX */ #ifdef CONVEX -#define SIGNAL_CAST (void (*)(int)) #include #include #include -- cgit From 58734631b4233ec08b7a262587e400792f31f185 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 31 May 1996 15:13:29 +0000 Subject: Lots of changes! - add faq info on NT printer handling - add "delete readonly" option to help rcs users - add stuff to man pages on new printer options - add "proxy name resolution" option - add "command string" -c option to smbclient (thanks Ken) - split time functions into time.c - rearrange the quotas stuff a bit and fix some bugs - complete rehash of the time handling code thanks to Paul Eggert - fix nmblookup output a bit - add plp print queue parsing from Bertrand Wallrich (This used to be commit 635b56f19c817527c52e9bbde31faa6a8a47777b) --- source3/include/includes.h | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2408b3c194..dc1fe57e71 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -198,27 +198,6 @@ #include #endif -/* this might be different on different systems */ -#ifdef QUOTAS -#ifdef LINUX -#ifdef __KERNEL__ -#undef __KERNEL__ -#include -#define __KERNEL__ -#else -#include -#endif -#include -#else -#include -#ifndef CRAY -#include -#else -#include -#endif -#endif -#endif - #ifdef SYSLOG #include #endif @@ -499,6 +478,8 @@ char *mktemp(char *); /* No standard include */ #define USE_WAITPID #define SIGNAL_CAST (void (*)()) #define DEFAULT_PRINTING PRINT_AIX +/* we undef this because sys/param.h is broken in aix. uggh. */ +#undef MAXHOSTNAMELEN #endif -- cgit From 81e398963dbaed9c6661c336fe98329098576b94 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 1 Jun 1996 15:25:30 +0000 Subject: - moved the uid handling to uid.c - added setfsuid() support (for Linux) - started adding some of Lukes changes, just the loadparm and ipc ones so far (This used to be commit 72543810ce3eb5ea7b141f957edf38b4c46b1ea4) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index dc1fe57e71..8b2821948c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -223,6 +223,7 @@ Here come some platform specific sections #define USE_SETSID #define HAVE_BZERO #define HAVE_MEMMOVE +#define USE_SETFS #ifdef SHADOW_PWD #ifndef crypt #define crypt pw_encrypt -- cgit From a2c1623827406667a4f2f058c24f1d971f6627f8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 4 Jun 1996 06:42:03 +0000 Subject: a huge pile of changes :-) The biggest thing is the integration of Lukes new nmbd. Its still largely untested, so we will really need some feedback I've also added auto prototype generation and cleaned up a lot of minor things as a result (This used to be commit 0d8dcfa13c527ec2c8aca39ba49c09e4e694b26c) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b2821948c..ad65bcc607 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -983,6 +983,8 @@ extern char *sys_errlist[]; #include "version.h" #include "smb.h" +#include "nameserv.h" +#include "proto.h" #include "byteorder.h" #ifdef SMB_PASSWD #include "smbpass.h" -- cgit From e38afbf38210b8cf30c5b13dc5ea96a6dda433f7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 5 Jun 1996 15:16:09 +0000 Subject: - changed some debug levels in clientutil.c - added dir_check_ftype() to clean up the file type checking a bit - added check for libc version >= 5 for setfsuid() for Linux - moved the AM_MASTER() and related macros to nameserv.h - added proper defines for the various netbios announce types - don't call the announce_backup() code, as I'm pretty sure its wrong it sent ANN_GetBackupListReq packets as broadcasts, they are supposed to be used only by clients to the master browser to find a list of available backup servers to remote a netserverenum to, I don't think nmbd should ever send one. - fixed a bug in the browse list writing - minor debug cleanups - put in the code to discard our own broadcasts (it won't work for multi-homed hosts though) - changed ELECTION_VERSION to 1 so we can be beaten by a NT 3.51 server by lowering the os level. - only do sync_browse_lists() if we are the master browser, otherwise we'll cause network overload - don't call tell_become_backup() as it appears to be badly broken, it should only be used when the machine being told has its MAINTAIN_LIST to to auto. Not calling it does no great harm anyway - fix a nasty bug where becomebackup was confused with reset browser! - make setbuffer() not get caught by the auto protototypes (This used to be commit cfbad9b08242962f41595273de08a7293fe432b1) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ad65bcc607..5b29b27547 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -223,7 +223,9 @@ Here come some platform specific sections #define USE_SETSID #define HAVE_BZERO #define HAVE_MEMMOVE +#if _LINUX_C_LIB_VERSION_MAJOR >= 5 #define USE_SETFS +#endif #ifdef SHADOW_PWD #ifndef crypt #define crypt pw_encrypt -- cgit From b9ae225b28f4707609e6436dad4be7ebdd7e181f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jun 1996 11:43:09 +0000 Subject: - added interface.c and removed all the references to myip, bcast_ip and Netmask, instead replacing them with calls to routines in interface.c - got rid of old MAXINT define - added code to ensure we only return one entry for each name in the ipc enum routines - added new_only option to add_netbios_entry() to prevent overwriting of important names - minor time handling fixup (This used to be commit 7ed71b73ae745da099072eee36fc2700d1d91407) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b29b27547..549407bc9e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -899,10 +899,6 @@ extern char *getsmbpass(char *); #define FD_SETSIZE 255 #endif -#ifndef MAXINT -#define MAXINT ((((unsigned)1)<<(sizeof(int)*8-1))-1) -#endif - #ifndef __STDC__ #define const #endif -- cgit From b6037f01a01e040e518eca0ea75c53a475e36b0c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 18 Jul 1996 10:20:51 +0000 Subject: minor cleanups ready for another release (This used to be commit 153d324c7be345ae87f99e62123e9a7dbaf74aee) --- source3/include/includes.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 549407bc9e..55423dc431 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -984,9 +984,6 @@ extern char *sys_errlist[]; #include "nameserv.h" #include "proto.h" #include "byteorder.h" -#ifdef SMB_PASSWD -#include "smbpass.h" -#endif #include "kanji.h" #include "charset.h" -- cgit From bcfba000df14c5178fb761cf8ceb08b337b52b79 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 18 Jul 1996 17:09:22 +0000 Subject: NeXT needs #define pid_t int in includes.h namedbname.c:find_name_search() needed search capability on both local subnet records and WINS records. it used to return NULL if the name was not found in the local subnet records even if you asked it to search the WINS name records as well. (This used to be commit 96c2efded884ce4390c5da68afaccca9acc17558) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 55423dc431..56a63d46ae 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -584,6 +584,7 @@ char *mktemp(char *); /* No standard include */ #define mode_t int #define GID_TYPE int #define gid_t int +#define pid_t int #define SIGNAL_CAST (void (*)(int)) #define WAIT3_CAST1 (union wait *) #define HAVE_GMTOFF -- cgit From 396311075cc808278e6dd8469e3ac7eb7e7498c7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 13 Aug 1996 08:57:55 +0000 Subject: - sequent-ptx support from bressler@iftccu.ca.boeing.com (Rick Bressler) - machten support from Trevor Strohman (trev@figment.tenon.com) - added qinfo command to client as part of drag-and-drop printer support for win95 from David Chappell He also added the "printer driver" option - use sigblock() on more systems and use sigsetmask(0) instead of sigunblock() as its more portable. This beats a problem with zombies on heavilily loaded systems. - added internals.doc written by David Chappell into the source tree - get rid of PRINT_COMMAND options from local.h as they are no longer relevent - new kanji code from Fujita - don't set the recursion_available flag on queries in nmbd - fix a potential bug with pointer subtraction in printing.c - got rid of error_count code as the real fix (the EOF problem) is now in (This used to be commit aa6f8b04d125b5bc00f267abf72b800228aabf7d) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 56a63d46ae..bcf79ac79a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -223,6 +223,7 @@ Here come some platform specific sections #define USE_SETSID #define HAVE_BZERO #define HAVE_MEMMOVE +#define USE_SIGBLOCK #if _LINUX_C_LIB_VERSION_MAJOR >= 5 #define USE_SETFS #endif @@ -255,6 +256,7 @@ typedef unsigned short mode_t; #endif #define REPLACE_GETPASS #define BSD_TERMIO +#define USE_SIGBLOCK #endif @@ -288,6 +290,7 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_GETCWD #define USE_SETSID #define REPLACE_GETPASS +#define USE_SIGBLOCK #endif @@ -479,6 +482,7 @@ char *mktemp(char *); /* No standard include */ #include #define SYSV #define USE_WAITPID +#define USE_SIGBLOCK #define SIGNAL_CAST (void (*)()) #define DEFAULT_PRINTING PRINT_AIX /* we undef this because sys/param.h is broken in aix. uggh. */ @@ -529,7 +533,12 @@ char *mktemp(char *); /* No standard include */ #define NO_EID #define STATFS4 #define USE_DIRECT +#ifdef PTX4 +#undef USE_DIRECT #endif +#endif + + #ifdef SEQUENT_PTX4 #include -- cgit From d2be32ca09b13a4c1c572e06235f64fd55ee8afd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 14 Aug 1996 15:00:00 +0000 Subject: disabled SETFS (which was only enabled for Linux) until we resolve a couple of bug reports that may be caused by it. Andrew (This used to be commit 424814bed710a96d87786763b851a11ea1103026) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bcf79ac79a..3057531f7f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -224,9 +224,12 @@ Here come some platform specific sections #define HAVE_BZERO #define HAVE_MEMMOVE #define USE_SIGBLOCK +#if 0 +/* SETFS disabled until we can check on some bug reports */ #if _LINUX_C_LIB_VERSION_MAJOR >= 5 #define USE_SETFS #endif +#endif #ifdef SHADOW_PWD #ifndef crypt #define crypt pw_encrypt -- cgit From 47673b32ed4a907b380b70d5f4f366ba8be301d2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 15 Aug 1996 15:11:34 +0000 Subject: - added FAST_SHARE_MODES code - added some named pipe code from Jim (This used to be commit c94866e9e44ea1eb72da06bc65ef1c032ae8e0c9) --- source3/include/includes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3057531f7f..fd468abc07 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -183,7 +183,7 @@ #endif #endif -#if USE_MMAP +#if defined(USE_MMAP) || defined(FAST_SHARE_MODES) #include #endif @@ -223,7 +223,7 @@ Here come some platform specific sections #define USE_SETSID #define HAVE_BZERO #define HAVE_MEMMOVE -#define USE_SIGBLOCK +#define USE_SIGPROCMASK #if 0 /* SETFS disabled until we can check on some bug reports */ #if _LINUX_C_LIB_VERSION_MAJOR >= 5 @@ -259,7 +259,7 @@ typedef unsigned short mode_t; #endif #define REPLACE_GETPASS #define BSD_TERMIO -#define USE_SIGBLOCK +#define USE_SIGPROCMASK #endif @@ -293,7 +293,7 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_GETCWD #define USE_SETSID #define REPLACE_GETPASS -#define USE_SIGBLOCK +#define USE_SIGPROCMASK #endif -- cgit From 8508c953b128a3aecf99cb003d7773a3d40be789 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 16 Aug 1996 07:39:46 +0000 Subject: added support for the Bull Operating System (BOS) (This used to be commit 46277e64a1bcfeff3715ebca3657ef4103ac4664) --- source3/include/includes.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fd468abc07..79400683fe 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -891,6 +891,20 @@ typedef int mode_t; #endif +#ifdef BOS +#define SIGNAL_CAST (void (*)(int)) +#include +#include +#include +#include +#include +#include +#include +#include +#endif + + + /******************************************************************* end of the platform specific sections ********************************************************************/ -- cgit From efb8113d00a4513c1115640004c0905465d3b673 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 17 Aug 1996 14:27:12 +0000 Subject: - made FAST_SHARE_MODES standard for Linux - you can now press enter after a password prompt with "smbclient -L hostname" and it will use a blank username and password, the same as if you used -U% - changed the wins.dat store code to not go via a string variable (just use fprintf instead) - removed a "unsigned long" that luke put back in, changing it to uint32 to keep 64 bit machines happy. Naughtly luke! - allow guest non-connnected print queue listings so ms client 3 can work (This used to be commit 917160dee69bbc198985b6f3232ca2dcda809d8a) --- source3/include/includes.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 79400683fe..35ef18055c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -183,10 +183,6 @@ #endif #endif -#if defined(USE_MMAP) || defined(FAST_SHARE_MODES) -#include -#endif - #if defined(GETPWANAM) #include #include @@ -224,6 +220,7 @@ Here come some platform specific sections #define HAVE_BZERO #define HAVE_MEMMOVE #define USE_SIGPROCMASK +#define FAST_SHARE_MODES 1 #if 0 /* SETFS disabled until we can check on some bug reports */ #if _LINUX_C_LIB_VERSION_MAJOR >= 5 @@ -909,6 +906,10 @@ typedef int mode_t; end of the platform specific sections ********************************************************************/ +#if defined(USE_MMAP) || FAST_SHARE_MODES +#include +#endif + #ifdef SecureWare #define NEED_AUTH_PARAMETERS #endif -- cgit From 0c33046a0aa0461a5e932dd7b0b6e38ab9708867 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 19 Aug 1996 11:17:29 +0000 Subject: - added "netbios name" option in smb.conf to make controlling the name that samba uses possible - added "socket address" option to allow virtual SMB servers (on systems with IP aliasing line Linux) - disabled FAST_SHARE_MODES by default in Linux as older Linux boxes can't do shared writeable mappings. We really need autoconf ... - added new option types in loadparm so a string type can be specified ot be uppercase only, this is used for the workgroup and netbios name options - auto-create the lock directory if it doesn't exist in shared mem startup - get rid of announce_backup() - change a few comments in nmbd code - rewrote the chaining code completely. Hopefully it will handle any depth chains now. - added LPRng support (This used to be commit e9eac6cd49c352349580ddb13d720cb201aecc48) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 35ef18055c..c7acbddc2b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -220,7 +220,6 @@ Here come some platform specific sections #define HAVE_BZERO #define HAVE_MEMMOVE #define USE_SIGPROCMASK -#define FAST_SHARE_MODES 1 #if 0 /* SETFS disabled until we can check on some bug reports */ #if _LINUX_C_LIB_VERSION_MAJOR >= 5 -- cgit From 748d65a4ac898708dc7d2fd6f2bdee41489fee86 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 20 Aug 1996 15:45:16 +0000 Subject: - fix a bug in NetServerEnum where counted and total were not counted correctly if there were multiple instances of a name. This led to the infamous "not enough memory" error when browsing (but this isn't the only cause of that message) - fix a triple-chaining bug which affected OpenX following a TconX - fix a serious nmbd bug that meant nmdb would answer packets that it wasn't supposed to, causing havoc with browse lists. - never time out SELF packets. This is an interim fix until I find out why nmbd thought they should be timed out. (This used to be commit 2960c3908c2c3b01a1f2b77def60350018d298e1) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c7acbddc2b..5d5fd7fd55 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -227,11 +227,13 @@ Here come some platform specific sections #endif #endif #ifdef SHADOW_PWD +#if _LINUX_C_LIB_VERSION_MAJOR < 5 #ifndef crypt #define crypt pw_encrypt #endif #endif #endif +#endif #ifdef SUNOS4 #define SIGNAL_CAST (void (*)(int)) -- cgit From 38087ccb4071bfff29801026e2bf5c47565305b4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 5 Oct 1996 02:54:37 +0000 Subject: - use workgroup from smb.conf in smbclient - change debug level on clitar stuff - define MAP_FILE if not defined - ensure we never set authoritative on queries in nmbd - fake a positive response to SMBioctl, apparently this is needed for some WfWg printer drivers - deny file access for non-fcbopen queries when (access_allowed == AREAD && flags == O_RDWR) - add sys_waitpid() (This used to be commit 61e3116e573637d6b5a878eeb8db72831e3c5bd1) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5d5fd7fd55..90358ce49a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -220,6 +220,7 @@ Here come some platform specific sections #define HAVE_BZERO #define HAVE_MEMMOVE #define USE_SIGPROCMASK +#define USE_WAITPID #if 0 /* SETFS disabled until we can check on some bug reports */ #if _LINUX_C_LIB_VERSION_MAJOR >= 5 @@ -258,6 +259,7 @@ typedef unsigned short mode_t; #define REPLACE_GETPASS #define BSD_TERMIO #define USE_SIGPROCMASK +#define USE_WAITPID #endif @@ -1080,6 +1082,10 @@ it works and getting lots of bug reports */ #define SIGCLD SIGCHLD #endif +#ifndef MAP_FILE +#define MAP_FILE 0 +#endif + #ifndef HAVE_FCNTL_LOCK #define HAVE_FCNTL_LOCK 1 #endif -- cgit From f6c9fed7acaef5ff532a9cdf8d7f8a470fa7f73f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 5 Oct 1996 13:38:29 +0000 Subject: - use waitpid for ultrix - don't use wait4 (This used to be commit 2aa612d676e634a892fdc50349f5b72732f0e91f) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 90358ce49a..9d6bde5197 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -311,6 +311,7 @@ char *getwd(char *); #define SIGNAL_CAST (void(*)(int)) #endif #define USE_DIRECT +#define USE_WAITPID #endif #ifdef SGI -- cgit From 0f22ee6976c2eb6d699f86c0fd0ae7b795524848 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Tue, 10 Dec 1996 17:50:28 +0000 Subject: Added in changes for FreeBsd. jra@cygnus.com (This used to be commit 074d28fcb61045891191b007b19a099301a94d16) --- source3/include/includes.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9d6bde5197..25d112ccfb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -190,7 +190,7 @@ #include #endif -#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(CONVEX) +#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) #include #endif @@ -469,7 +469,16 @@ char *mktemp(char *); /* No standard include */ #include #include #define SIGNAL_CAST (void (*)()) +#define USE_SETVBUF +#define USE_SETSID +#define USE_GETCWD +#define USE_WAITPID #define USE_DIRECT +#define HAVE_MEMMOVE +#define HAVE_BZERO +#define HAVE_GETTIMEOFDAY +#define HAVE_PATHCONF +#define HAVE_GETGRNAM 1 #endif -- cgit From 4bf19abcad1dde50a930a7d8feab1a6808a954ed Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 2 Jan 1997 04:50:59 +0000 Subject: JHT => Modified for RedHat Linux for DEC Alpha platform includes. (This used to be commit 40fa8d4be629ccffa93ba7d969f2684907a058fa) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 25d112ccfb..0b989df20d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -139,6 +139,9 @@ #endif #include +#ifdef AXPROC +#include +#endif #include #include #ifdef POSIX_H -- cgit From 8bc7d6bebd4fcf8c95cb6d58da14404a5e46de91 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 9 Jan 1997 18:02:17 +0000 Subject: Makefile: Changes to split Solaris into Solaris2.3 and previous, and 2.4 and after from Paul Eggert. Makefile: Added AMIGA changes from Rask Ingemann Lambertsen . charset.c: Patch for Western European Languages from Josef Hinteregger charset.h: Patch for Western European Languages from Josef Hinteregger clitar.c: Patch to re-sync after read fail from (lost contributor name, sorry). includes.h: Patch for AMIGA from Rask Ingemann Lambertsen includes.h: Patch for SunOS atexit by Jeremy (jra@cygnus.com) interface.c: Patch for AMIGA from Rask Ingemann Lambertsen kanji.h: Patch for Western European Languages from Josef Hinteregger locking.c: Patch to fix file locking from Jeremy (jra@cygnus.com) locking.c: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com) pipes.c: Patch to fix file locking from Jeremy (jra@cygnus.com) proto.h: Patch to fix file locking from Jeremy (jra@cygnus.com) reply.c: Patch to fix file locking from Jeremy (jra@cygnus.com) server.c: Patch to fix file locking from Jeremy (jra@cygnus.com) server.c: Patch for FAST_SHARE_MODE fix from (lost contributor name, sorry). smb.h: Patch to fix file locking from Jeremy (jra@cygnus.com) smb.h: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com) status.c: Patch to fix file locking from Jeremy (jra@cygnus.com) statuc.c: Patch to add granularity of lock files to usec by Jeremy (jra@cygnus.com) system.c: Patch for Western European Languages from Josef Hinteregger trans2.c: Patch to fix file locking from Jeremy (jra@cygnus.com) trans2.c: Patch to fix volume name reported to Win95 from Jeremy (jra@cygnus.com) util.c: Patch for Western European Languages from Josef Hinteregger util.c: Patch to fix client_name from continuously returning UNKNOWN (from various contributors). version.h: Update to 1.9.16p10. (This used to be commit 03d28fa32eb094affa33133ebe2602fdb70f6361) --- source3/include/includes.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0b989df20d..0e93df35fd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -259,11 +259,21 @@ typedef unsigned short mode_t; #include #define NO_STRERROR #endif +#ifndef REPLACE_GETPASS #define REPLACE_GETPASS +#endif +#ifndef BSD_TERMIO #define BSD_TERMIO +#endif +#ifndef USE_SIGPROCMASK #define USE_SIGPROCMASK +#endif +#ifndef USE_WAITPID #define USE_WAITPID #endif +/* SunOS doesn't have POSIX atexit */ +#define atexit on_exit +#endif #ifdef SUNOS5 @@ -496,6 +506,7 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include #define SYSV #define USE_WAITPID #define USE_SIGBLOCK @@ -642,6 +653,7 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include #ifdef EVEREST #include #endif @@ -916,6 +928,38 @@ typedef int mode_t; #include #endif +#ifdef AMIGA +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define SIGNAL_CAST (void (*)(int)) +#define USE_GETCWD +#define HAVE_BZERO +#define HAVE_MEMMOVE +#define USE_SIGPROCMASK +#define USE_WAITPID +#define USE_DIRECT +#define USE_F_FSIZE +#define HAVE_FCNTL_LOCK 0 +#define HAVE_GETTIMEOFDAY +#define HAVE_PATHCONF + +#define HAVE_NO_PROC +#define NO_FORK_DEBUG +#define HAVE_FORK 0 +#define HAVE_VFORK 1 +#endif /******************************************************************* -- cgit From cbc6c3faf207a14c2c47fc8781d1316c2312fdd5 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 13 Feb 1997 20:49:12 +0000 Subject: Fixed inclusion of crypt.h bug when libdes is being used on Solaris only. jra@cygnus.com (This used to be commit c189ef38455653334b8414f30d0aeaa3ecefa202) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0e93df35fd..a8653d0978 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -290,8 +290,10 @@ typedef unsigned short mode_t; #include #include #include -#include #include +#ifndef USE_LIBDES +#include +#endif /* USE_LIBDES */ extern int gettimeofday (struct timeval *, void *); extern int gethostname (char *name, int namelen); extern int innetgr (const char *, const char *, const char *, const char *); -- cgit From 20b5dea237916902437ce3dcdb7c253fd1ad3585 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Wed, 9 Apr 1997 01:19:25 +0000 Subject: Large changes from jra@cygnus.com. Mainly browser updates. access.c: Fixed crash if yp domain unavailable. includes.h: Moved ifdefs for minor platform. interface.c: Changed name of ipgrp to wins_ip to make it clearer. loadparm.c: Changed default of wins support to 'no'. nameannounce.c: Many changes to fix cross subnet browsing. namebrowse.c: Many changes to fix cross subnet browsing. namedbname.c: Many changes to fix cross subnet browsing. namedbresp.c: Many changes to fix cross subnet browsing. namedbsubnet.c: Many changes to fix cross subnet browsing. namedbwork.c: Many changes to fix cross subnet browsing. nameelect.c: Many changes to fix cross subnet browsing. namelogon.c: Many changes to fix cross subnet browsing. namepacket.c: Many changes to fix cross subnet browsing. nameresp.c: Many changes to fix cross subnet browsing. nameserv.c: Many changes to fix cross subnet browsing. nameserv.h: Many changes to fix cross subnet browsing. nameservreply.c: Many changes to fix cross subnet browsing. nameservresp.c: Many changes to fix cross subnet browsing. namework.c: Many changes to fix cross subnet browsing. nmbd.c: Change to search wins subnet. nmbsync.c: Change to check if we are any master before proceeding. proto.h: Added find_subnet_all() and check_work_servertype(). util.c: Moved 'done' settings on name resolution. (This used to be commit a82476eee2c521e5eed092bc367da0a7cef23de1) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a8653d0978..249e4940a9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -344,6 +344,7 @@ char *getwd(char *); #endif #ifdef SGI5 +#include #include #include #include @@ -427,6 +428,7 @@ char *mktemp(char *); /* No standard include */ #define SIGNAL_CAST ( void (*) (int) ) #define STATFS3 #define USE_F_FSIZE +#define USE_SETSID #include #ifdef OSF1_ENH_SEC #include -- cgit From 0f1f0ceb9519368188f695e18e2341ccfd1b2d15 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 8 May 1997 01:14:17 +0000 Subject: 'The mother of all checkins' :-). Jeremy Allison (jallison@whistle.com) Wed May 7 1997: Update for 1.9.17alpha1 release - 'browsefix release' designed to make browsing across subnets work. byteorder.h: Updated copyright to 1997. charcnv.c: Updated copyright to 1997. charset.c Updated copyright to 1997. charset.h Updated copyright to 1997. client.c Updated copyright to 1997. clientutil.c Updated copyright to 1997. dir.c Updated copyright to 1997. fault.c Updated copyright to 1997. includes.h Updated copyright to 1997. interface.c Updated copyright to 1997. ipc.c Updated copyright to 1997. kanji.c Updated copyright to 1997. kanji.h Updated copyright to 1997. loadparm.c Updated copyright to 1997. locking.c Updated copyright to 1997. mangle.c Updated copyright to 1997. message.c Updated copyright to 1997. nameannounce.c Made use of WINS subnet explicit. Added reset_announce_timer() so announcement can be made immediately when we become a master. Expanded code to do sync with dmb. namebrowse.c Removed redundent checks for AM_MASTER in sync code. Made use of WINS subnet explicit. namedbname.c Made use of WINS subnet explicit. namedbresp.c Made use of WINS subnet explicit. namedbserver.c Made use of WINS subnet explicit. namedbsubnet.c Explicitly add workgroup to WINS subnet when we become a dmb. Made use of WINS subnet explicit. namedbwork.c Made use of WINS subnet explicit. Removed redundent check_work_servertype() function. nameelect.c Explicitly add workgroup to WINS subnet when we become a master browser. Made use of WINS subnet explicit. namelogon.c Updated copyright to 1997. namepacket.c Updated copyright to 1997. namequery.c Updated copyright to 1997. nameresp.c Made use of WINS subnet explicit. Made nmbd fail if configured as master browser and one exists already. nameserv.c Made use of WINS subnet explicit. Remove redundent logon server and domain master code. nameserv.h Add emumerate subnet macros. nameservreply.c Made use of WINS subnet explicit. nameservresp.c Updated copyright to 1997. namework.c Made use of WINS subnet explicit. Updated code to add sync browser entries to add subnet parameter. nmbd.c Added sanity check for misconfigured nmbd. nmblib.c Updated copyright to 1997. nmblookup.c Updated copyright to 1997. nmbsync.c Removed redundent AM_ANY_MASTER check. params.c Updated copyright to 1997. password.c Updated copyright to 1997. pipes.c Updated copyright to 1997. predict.c Updated copyright to 1997. printing.c Updated copyright to 1997. proto.h Changed protos for new nmbd code. quotas.c Updated copyright to 1997. replace.c Updated copyright to 1997. reply.c Updated copyright to 1997. server.c Updated copyright to 1997. shmem.c Updated copyright to 1997. smb.h Updated copyright to 1997. smbencrypt.c Updated copyright to 1997. smbpasswd.c Updated copyright to 1997. smbrun.c Updated copyright to 1997. status.c Updated copyright to 1997. system.c Updated copyright to 1997. testparm.c Updated copyright to 1997. testprns.c Updated copyright to 1997. time.c Updated copyright to 1997. trans2.c Updated copyright to 1997. trans2.h Updated copyright to 1997. uid.c Updated copyright to 1997. username.c Updated copyright to 1997. util.c Updated copyright to 1997. version.h Changed to 1.9.17alpha1. (This used to be commit cf23a155a1315f50d488794a2caf88402bf3e3e6) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 249e4940a9..e1ed3a5816 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -4,7 +4,7 @@ Unix SMB/Netbios implementation. Version 1.9. Machine customisation and include handling - Copyright (C) Andrew Tridgell 1994-1995 + Copyright (C) Andrew Tridgell 1994-1997 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit From aa864415c5183c948fe9ae221023d40265c38013 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Tue, 20 May 1997 00:32:51 +0000 Subject: dir.c: Fixed double slash issue. includes.h: Changed to ifdef FAST_SHARE_MODES. ipc.c: Changed lp_workgroup() to myworkgroup. loadparm.c: Added new shared mem parameters. Added Luke's fix. locking.c: Rewrite to do share modes better (both fast and slow modes). nameannounce.c: Changed lp_workgroup() to myworkgroup. Added Luke's fix. nameconf.c: Changed lp_workgroup() to myworkgroup. namedbname.c: Improved debug. namedbserver.c: Changed lp_workgroup() to myworkgroup. namedbsubnet.c: Added Luke's fix - rewritten somewhat. namedbwork.c: Changed lp_workgroup() to myworkgroup. nameelect.c: Added Luke's fix - rewritten somewhat. nameresp.c: Stoped shadowing global. nameserv.c: Added Luke's fix - Improved debug. nameservreply.c: Improved debug. namework.c: Changed lp_workgroup() to myworkgroup. nmbd.c: Added Luke's fix - Changed lp_workgroup() to myworkgroup. pipes.c: Changed lp_workgroup() to myworkgroup. proto.h: Added Luke's fix, added smb_shm_ proto's. reply.c: Changed lp_workgroup() to myworkgroup. server.c: Rewrite to do share modes better (both fast and slow modes). shmem.c: Rewrite to do share modes better (both fast and slow modes). smb.h: Rewrite to do share modes better (both fast and slow modes). status.c: Rewrite to do share modes better (both fast and slow modes). trans2.c: Fixed double slash issue. util.c: Tidied up, created myworkgroup. Jeremy Allison (jallison@whistle.com). (This used to be commit 2a1711eaaf08bb6776770cd3c96b3010f431a677) --- source3/include/includes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e1ed3a5816..265e838be0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -481,6 +481,7 @@ char *mktemp(char *); /* No standard include */ #ifdef FreeBSD +#include #include #include #include @@ -970,7 +971,7 @@ typedef int mode_t; end of the platform specific sections ********************************************************************/ -#if defined(USE_MMAP) || FAST_SHARE_MODES +#if defined(USE_MMAP) || defined(FAST_SHARE_MODES) #include #endif -- cgit From 3f067df49514c821eec5e9be132e6bd42c268506 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Tue, 3 Jun 1997 17:14:48 +0000 Subject: includes.h: Added USE_SETSID for SGI. nameelect.c: Added debug 0 comments so you know when you have become a master/domain master. nameservreply.c:Stopped SELF names from being remotely released. This still needs work. nmbsync.c: Added debug 0 comments so you know when a sync is being done. Jeremy jallison@whistle.com (This used to be commit b40d3bede60c8e040ee30c72d605a4950e1a8c8b) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 265e838be0..7403fc4b64 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -341,6 +341,7 @@ char *getwd(char *); #define STATFS4 #define USE_WAITPID #define USE_DIRECT +#define USE_SETSID #endif #ifdef SGI5 @@ -358,6 +359,7 @@ char *getwd(char *); #define SIGNAL_CAST (void (*)()) #define USE_STATVFS #define USE_WAITPID +#define USE_SETSID #endif -- cgit From fc3901122d51b76b5dd5d6a798dace35760590ad Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 3 Jul 1997 17:19:46 +0000 Subject: Fixes for UnixWare 2.x with shadow passwords from Warren Young . (This used to be commit 885b42b44752249c85bb924c9ceefa5b710225da) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7403fc4b64..44707673ee 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -968,6 +968,12 @@ typedef int mode_t; #define HAVE_VFORK 1 #endif +/* For UnixWare 2.x's ia_uinfo routines. (tangent@cyberport.com) */ +#ifdef IA_UINFO +#include +#include +#endif + /******************************************************************* end of the platform specific sections -- cgit From 25eae02948b40667495fbb021dd130180180a05e Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Tue, 8 Jul 1997 16:54:44 +0000 Subject: Makefile: Added AIX targets from Ole Holm Nielsen chgpasswd.c: Added Samba/GPL notice (for obvious reasons). clitar.c: Updated Copyright date to include 1997 (for obvious reasons). getsmbpass.c: Updated Copyright date to include 1997 (for obvious reasons). includes.h: Added stropts for solaris. loadparm.c: Changed comment for hide files option. nameconf.c: Updated Copyright date to include 1997 (for obvious reasons). nmbd.c: Updated Copyright date to include 1997 (for obvious reasons). pcap.c: Updated Copyright date to include 1997 (for obvious reasons). proto.h: Re-added accidentaly deleted smb_shm_ calls. quotas.c: Added AIX quota patch from Ole Holm Nielsen server.c: Optimization on calling is_hidden_path. Updated Copyrights. smb.h: Changed DEFAULT_FILES_TO_HIDE from "*/.*" to ".*". smbpass.c: Updated Copyright date to include 1997 (for obvious reasons). ufc.c: Updated Copyright date to include 1997 (for obvious reasons). util.c: Added last component code to is_in_path(). Jeremy (jallison@whistle.com) (This used to be commit 9385ae1005f13c8ed51f1319e3949b5c8571e62d) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 44707673ee..a5adb35077 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -291,6 +291,7 @@ typedef unsigned short mode_t; #include #include #include +#include #ifndef USE_LIBDES #include #endif /* USE_LIBDES */ -- cgit From 8b904f4ecc7b6bd6558d40fda4184112bbb10366 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 17 Jul 1997 20:11:58 +0000 Subject: Makefile: Added krb5 option from Nathan Neulinger includes.h: Added krb5 option from Nathan Neulinger , added SGI5 fix. password.c: Added krb5 option from Nathan Neulinger quotas.c: Added inode quote fix. reply.c: removed redundent code. server.c: Changed error debug to 0, removed redundent check. util.c: Added close_low_fd() to become_daemon - fix for rsh from Johnathan Knight. Jeremy (jallison@whistle.com) (This used to be commit 256afb764828b0a6dad5529d62501bc9ea2807ee) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a5adb35077..7dcff54286 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -348,6 +348,8 @@ char *getwd(char *); #ifdef SGI5 #include #include +#include +#include #include #include #include @@ -1059,6 +1061,10 @@ struct spwd { /* fake shadow password structure */ #include #endif +#ifdef KRB5_AUTH +#include +#endif + #ifdef NO_UTIMBUF struct utimbuf { time_t actime; -- cgit From 15ae50ca5203bc4c04567e400ba041a4d1757b2b Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 24 Jul 1997 17:25:11 +0000 Subject: Makefile: Added UNIXWARE 2.x with shadow passwords from fja@extratech.com client.c: Made prompt appear at debug level 0. Fixed strcasecmp redefinition. Caused client to use set_blocking rather than making fcntl calls itself. dir.c: Removed redundent snum parameters. includes.h: Added SCO fixes. loadparm.c: Made default 'files to hide' a null string. nmbd.c: Removed O_NONBLOCK from pid file open for platforms that dont have it. proto.h: Changed snum to cnum where needed. Changed is_xx_path to is_in_path (now called via MACRO). quotas.c: Swapped setuid/seteuid calls when restoring uid. reply.c: Removed redundent snum parameters. server.c: Changed snum to cnum where needed. Setup new veto_list, hide_list namelists. Added standard_sub changes from Stefaan A Eeckels and Paul Rippin shmem.c: Changed cast for sizeof to be int before negating. smb.h: Added new veto_list, hide_list entries to connections. Added IS_PRINT, IS_HIDDEN_PATH, IS_VETO_PATH macros. trans2.c: Removed redundent snum parameters. util.c: Added standard_sub_basic changes from Stefaan A Eeckels and Paul Rippin Fixed up veto/hidden path processing so the paths are pres-parsed and checked for wildcards (for speed). Jeremy (jallison@whistle.com) (This used to be commit 9afa36f7874cfd527aa6ef1e7965c1d35d46ab1f) --- source3/include/includes.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7dcff54286..35112ff70b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -666,38 +666,35 @@ char *mktemp(char *); /* No standard include */ #include #ifdef EVEREST #include -#endif +#endif /* EVEREST */ #ifdef NETGROUP #include -#endif +#endif /* NETGROUP */ #ifdef SecureWare #include #include #include #define crypt bigcrypt -#endif -#ifndef EVEREST - #define ftruncate(f,l) syscall(0x0a28,f,l) -#endif +#endif /* SecureWare */ #define SIGNAL_CAST (void (*)(int)) #define USE_WAITPID #define USE_GETCWD #define USE_SETSID #ifdef SCO3_2_2 -#define NO_EID -#else +#define setuid(u) setreuid(u,-1) +#define seteuid(u) setreuid(-1,u) +#else /* SCO3_2_2 */ #ifndef EVEREST +#define ftruncate(f,l) syscall(0x0a28,f,l) #define USE_IFREQ -#endif -#endif +#define NO_INITGROUPS +#endif /* EVEREST */ +#endif /* SCO3_2_2 */ #define STATFS4 #define NO_FSYNC -#ifndef EVEREST -#define NO_INITGROUPS -#endif #define HAVE_PATHCONF #define NO_GETRLIMIT -#endif +#endif /* SCO */ -- cgit From b65fdef1ba6a9a0a27da724a8324a6f2804759cf Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Wed, 13 Aug 1997 20:16:32 +0000 Subject: includes.h: Fixed S_IFLNK for old DEC ultrix. ipc.c: Finally :-) fixed responses to NetServerEnum2 when SV_TYPE_ALL given. Jeremy (jallison@whistle.com) (This used to be commit 1dc37c83506a434840a04c49e423cd9d2223fab4) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 35112ff70b..03c2d461e6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1105,6 +1105,10 @@ extern char *sys_errlist[]; #define S_ISDIR(x) ((S_IFDIR & x)!=0) #endif +#if !defined(S_ISLNK) && defined(S_IFLNK) +#define S_ISLNK(x) ((S_IFLNK & x)!=0) +#endif + #ifdef UFC_CRYPT #define crypt ufc_crypt #endif -- cgit From e9269c67a59ffa741123cb2ce3ab8dfb97136dec Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Tue, 19 Aug 1997 19:22:26 +0000 Subject: Makefile: Changed for HPUX10 tidyup. includes.h: Changed for HPUX10 tidyup. ipc.c: Fixed bug where getting local server list from NT browsers would fail. nmbsync.c: Fixed bug where getting local server list from NT browsers would fail. proto.h: Changed for crash bug on SCO with USE_MMAP. quotas.c: Added OSF quotas (patch from Bret Giddings ). Rolled back solaris uid change - I think it was wrong. reply.c: Changed for crash bug on SCO with USE_MMAP. server.c: Removed Lukes changes. Changed for crash bug on SCO with USE_MMAP. smb.h: Changed for crash bug on SCO with USE_MMAP. smbpasswd.c:Fixed crash bug with Lukes changes. uid.c: Removed Lukes changes. util.c: Fixed I18N bug with extended char filenames and widelinks = no. Jeremy (jallison@whistle.com) (This used to be commit bf1c79f7fd7f9beec4f9f4e58337cadceeb1cb38) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 03c2d461e6..15a5e74e46 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -541,7 +541,9 @@ char *mktemp(char *); /* No standard include */ #define NEED_AUTH_PARAMETERS #endif #define SIGNAL_CAST (void (*)(__harg)) +#ifndef HPUX10 /* This is only needed for HPUX 9.x */ #define SELECT_CAST (int *) +#endif /* HPUX10 */ #define SYSV #define USE_WAITPID #define WAIT3_CAST2 (int *) @@ -550,7 +552,7 @@ char *mktemp(char *); /* No standard include */ #define USE_SETRES #define DEFAULT_PRINTING PRINT_HPUX #define SIGCLD_IGNORE -#endif +#endif /* HPUX */ #ifdef SEQUENT -- cgit From 473c42a194d07581941d61cf30aaf0122213cfd7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 28 Aug 1997 20:59:51 +0000 Subject: includes.h: Make sure REPLACE_GETPASS are wrapped with #ifdefs. nmbsync.c: Make sure REPLACE_GETPASS is defined before including includes.h clientutil.c: Catch null passwords. Fixes for a nmbd crash bug found by Herb Lewis @ SGI. Jermey(jallison@whistle.com) (This used to be commit 45c266baaea8755f1a3c0c4c7a87eb0752848ca2) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 15a5e74e46..a63f8f8597 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -308,7 +308,9 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_STATVFS #define USE_GETCWD #define USE_SETSID +#ifndef REPLACE_GETPASS #define REPLACE_GETPASS +#endif /* REPLACE_GETPASS */ #define USE_SIGPROCMASK #endif @@ -459,7 +461,9 @@ char *mktemp(char *); /* No standard include */ #define NO_FSYNC #define USE_GETCWD #define USE_SETSID +#ifndef REPLACE_GETPASS #define REPLACE_GETPASS +#endif /* REPLACE_GETPASS */ #define NO_GETRLIMIT #endif /* CLIX */ -- cgit From 81eb442e88e8231b8e9c556c1ee393e99269af78 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 23 Sep 1997 19:19:06 +0000 Subject: Checkin to sync up oplock development code so that NT domain development code won't diverge. Makefile: Fixed make proto (again). Added GLIBC2 fixes for Linux. includes.h: Added GLIBC2 fixes for Linux. proto.h: Much tidier. quotas.c: OSF/1 quota fix. reply.c: Fix from Ray Frush for zero NT timestamps. server.c util.c: First oplock checkin - nowhere near finished so bracketed with #ifdef USE_OPLOCKS. Done to make sync with NT domain code easier. Jeremy (jallison@whistle.com) (This used to be commit 7dce7d84473beb5663b14a8ab32781970819c19d) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a63f8f8597..e66ceb2d70 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -217,6 +217,14 @@ Here come some platform specific sections #ifndef NO_ASMSIGNALH #include #endif +#ifdef GLIBC2 +#define _LINUX_C_LIB_VERSION_MAJOR 6 +#include +#include +#include +#include +#include +#endif #define SIGNAL_CAST (__sighandler_t) #define USE_GETCWD #define USE_SETSID -- cgit From 6dd6b1383c0ed10c0897dea44f247befc15b03cc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 25 Sep 1997 00:25:44 +0000 Subject: Makefile: Removed earlier errors. includes.h: Added INADDR_LOOPBACK define. locking.c: More code to support oplocks. proto.h: Updated. server.c: More code to support oplocks. Moved processing of an SMB out of process() into a separate function so it is easier to call from an oplock break. smb.h: Added oplock fields. Jeremy (jallison@whistle.com) (This used to be commit f46dbaf08eb8e06a7545d2c19dce9e2dda9dcc78) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e66ceb2d70..2329553d23 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1194,6 +1194,10 @@ it works and getting lots of bug reports */ #define QSORT_CAST (int (*)()) #endif +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK 0x7f000001 +#endif /* INADDR_LOOPBACK */ + /* this is a rough check to see if this machine has a lstat() call. it is not guaranteed to work */ #if !(defined(S_ISLNK) || defined(S_IFLNK)) -- cgit From 89042c146eaefac41d6df99eeb2d2847ed3a3067 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 7 Oct 1997 11:14:27 +0000 Subject: get rid of SIGCLD_IGNORE for HPUX. A user reported it causing lots of defunct smbd processes. Andrew (This used to be commit bf1f8b1567cb46e3e73ae8dbb26f6228cf519c1f) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2329553d23..d1afc34de9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -563,7 +563,9 @@ char *mktemp(char *); /* No standard include */ #define USE_SETSID #define USE_SETRES #define DEFAULT_PRINTING PRINT_HPUX -#define SIGCLD_IGNORE +/* Ken Weiss tells us that SIGCLD_IGNORE is + not good for HPUX */ +/* #define SIGCLD_IGNORE */ #endif /* HPUX */ -- cgit From 74113cd60ecceaf73fce83e84dbcd58b498f2cb1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 8 Oct 1997 20:34:13 +0000 Subject: Makefile: Split definitions for SGI4,5,6. includes.h: Split definitions for SGI4,5,6. pipes.c: Moved Luke's #ifdef to remove warnings. quotas.c: Two changes for FreeBSD and SGI. server.c: Quota changes for large filesystems. Jeremy (jallison@whistle.com) (This used to be commit b8ff5543b9fa45095caa9f24aeb22a1dcc1cd308) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d1afc34de9..4ca1d4c3b0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -340,7 +340,7 @@ char *getwd(char *); #define USE_WAITPID #endif -#ifdef SGI +#ifdef SGI4 #include #include #include @@ -355,7 +355,7 @@ char *getwd(char *); #define USE_SETSID #endif -#ifdef SGI5 +#if defined(SGI5) || defined(SGI6) #include #include #include -- cgit From e5494e2c093fecd4b493ab925f7c7d30b79bc98d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 9 Oct 1997 06:36:04 +0000 Subject: bracket some macros change MAX_PASSWORD_LENGTH to MAX_PASS_LEN to prevent conflict on some systems add #ifdef around soft link dependent code (for systems that don't have soft links) (This used to be commit e10ba4b97a219e87b62d32834bf15ed2e323ed2e) --- source3/include/includes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4ca1d4c3b0..a877f1ffb3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1114,15 +1114,15 @@ extern char *sys_errlist[]; #endif #ifndef S_ISREG -#define S_ISREG(x) ((S_IFREG & x)!=0) +#define S_ISREG(x) ((S_IFREG & (x))!=0) #endif #ifndef S_ISDIR -#define S_ISDIR(x) ((S_IFDIR & x)!=0) +#define S_ISDIR(x) ((S_IFDIR & (x))!=0) #endif #if !defined(S_ISLNK) && defined(S_IFLNK) -#define S_ISLNK(x) ((S_IFLNK & x)!=0) +#define S_ISLNK(x) ((S_IFLNK & (x))!=0) #endif #ifdef UFC_CRYPT @@ -1202,7 +1202,7 @@ it works and getting lots of bug reports */ /* this is a rough check to see if this machine has a lstat() call. it is not guaranteed to work */ -#if !(defined(S_ISLNK) || defined(S_IFLNK)) +#if !defined(S_ISLNK) #define lstat stat #endif -- cgit From 10087a663bfda233d3e18137f469f0cc7e769a0a Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Fri, 17 Oct 1997 21:06:20 +0000 Subject: Simply moved the #include for ubi_dLinkList.h from within dir.c to includes.h. More consistent with current practice. (This used to be commit cb51c860b352fb9d07fb3298d0317274ba6c9925) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a877f1ffb3..ce02b8a02a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -117,6 +117,7 @@ by the previous section */ #include "local.h" +#include "ubi_dLinkList.h" #include #ifdef POSIX_STDLIBH #include -- cgit From 79b314447bdcda65cffdd3dd495932c417b545f7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 21 Oct 1997 18:27:55 +0000 Subject: chgpasswd.c: includes.h: SCO changes. server.c: Added code in open_sockets to allow 'bind interfaces only' to work as documented. Jeremy (jallison@whistle.com) (This used to be commit 46ac5928d9069af1dc60e9724f38e228dd578937) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ce02b8a02a..09c687aed5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -676,6 +676,7 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include #include #include #include -- cgit From c9fa24b7a8809a7963f0970cf2dd21f6804e31a4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Oct 1997 14:19:54 +0000 Subject: SYSV IPC implementation of fast share modes. It will try sysv IPC first, then if that fails it will try mmap(), then after that it will try share files. I have defined USE_SYSV_IPC for Linux, Solaris and HPUX at the moment. Probably a lot more could have it defined. In fact, the vast majority of systems support it. Need autoconf again :-) It should actually be faster than the mmap() version, and doesn't need any lock files. This means the problem of the share mem file being on a NFS drive will be gone. (This used to be commit cc8fe0f0629eea9acc39e30d8d76d5890a5b6978) --- source3/include/includes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 09c687aed5..91a2ec5c67 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -214,6 +214,9 @@ Here come some platform specific sections #include #include #include +#include +#include +#include #include #ifndef NO_ASMSIGNALH #include @@ -233,6 +236,7 @@ Here come some platform specific sections #define HAVE_MEMMOVE #define USE_SIGPROCMASK #define USE_WAITPID +#define USE_SYSV_IPC #if 0 /* SETFS disabled until we can check on some bug reports */ #if _LINUX_C_LIB_VERSION_MAJOR >= 5 @@ -293,6 +297,9 @@ typedef unsigned short mode_t; #include #include #include +#include +#include +#include #include #include #include @@ -317,6 +324,7 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_STATVFS #define USE_GETCWD #define USE_SETSID +#define USE_SYSV_IPC #ifndef REPLACE_GETPASS #define REPLACE_GETPASS #endif /* REPLACE_GETPASS */ @@ -548,6 +556,9 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include +#include +#include #ifdef HPUX_10_TRUSTED #include #include @@ -563,6 +574,7 @@ char *mktemp(char *); /* No standard include */ #define USE_GETCWD #define USE_SETSID #define USE_SETRES +#define USE_SYSV_IPC #define DEFAULT_PRINTING PRINT_HPUX /* Ken Weiss tells us that SIGCLD_IGNORE is not good for HPUX */ -- cgit From e06da92b377111a3c2931cf693ce14c40b054672 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Oct 1997 14:22:50 +0000 Subject: define USE_SYSV_IPC on a bunch more systems. Needs some testing though. (This used to be commit 8f2366e57d29458f2bb63d9a0033de5c730a1b94) --- source3/include/includes.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 91a2ec5c67..6f3450c4fd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -214,9 +214,6 @@ Here come some platform specific sections #include #include #include -#include -#include -#include #include #ifndef NO_ASMSIGNALH #include @@ -297,9 +294,6 @@ typedef unsigned short mode_t; #include #include #include -#include -#include -#include #include #include #include @@ -362,6 +356,7 @@ char *getwd(char *); #define USE_WAITPID #define USE_DIRECT #define USE_SETSID +#define USE_SYSV_IPC #endif #if defined(SGI5) || defined(SGI6) @@ -382,6 +377,7 @@ char *getwd(char *); #define USE_STATVFS #define USE_WAITPID #define USE_SETSID +#define USE_SYSV_IPC #endif @@ -438,6 +434,7 @@ extern struct passwd *getpwnam(); #define USE_STATVFS #define USE_GETCWD #define USE_SETSID +#define USE_SYSV_IPC #endif @@ -556,9 +553,6 @@ char *mktemp(char *); /* No standard include */ #include #include #include -#include -#include -#include #ifdef HPUX_10_TRUSTED #include #include @@ -1077,6 +1071,11 @@ struct spwd { /* fake shadow password structure */ #endif #endif +#ifdef USE_SYSV_IPC +#include +#include +#include +#endif #ifdef AFS_AUTH #include -- cgit From ba4d965fc0f78086171a5441545e561a0c4d044d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Oct 1997 14:25:26 +0000 Subject: define USE_SYSV_IPC on sunos4 (This used to be commit 6388da22eb95c8bfd3f17f5645bdaa16cfca0c6b) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6f3450c4fd..da736fb225 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -281,6 +281,7 @@ typedef unsigned short mode_t; #ifndef USE_WAITPID #define USE_WAITPID #endif +#define USE_SYSV_IPC /* SunOS doesn't have POSIX atexit */ #define atexit on_exit #endif -- cgit From d6739a10d0f7ef3c6034bb2690446e6575b8085b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Oct 1997 14:55:22 +0000 Subject: define semun for broken solaris sysvipc (This used to be commit 4db076e08bec525ee908a391b22fdc12cc66bc27) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index da736fb225..48e79b4292 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -320,6 +320,14 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_GETCWD #define USE_SETSID #define USE_SYSV_IPC + +union semun { + int val; + struct semid_ds *buf; + ushort *array; +}; + + #ifndef REPLACE_GETPASS #define REPLACE_GETPASS #endif /* REPLACE_GETPASS */ -- cgit From 79f670128fc5f377182d81c0f353138ab3923a45 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Oct 1997 15:07:01 +0000 Subject: enable sysv ipc and fast share modes on OSF1 (This used to be commit 3480524e15aba50dd459ac5979eabb8974898e35) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 48e79b4292..4c7ec56367 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -469,6 +469,7 @@ char *mktemp(char *); /* No standard include */ #define PASSWORD_LENGTH 16 #define NEED_AUTH_PARAMETERS #endif /* OSF1_ENH_SEC */ +#define USE_SYSV_IPC #endif -- cgit From 628d7993d52dff920f52fdbc8e672ae840b9a607 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 30 Oct 1997 08:44:29 +0000 Subject: moved ubi_ modules back into the ubiqx directory. I've added a very simple (and portable) method for having separate source directories. This should also help when we add directories for the various ports. A unix directory would make sense. (This used to be commit dc8998b1d3c119665538eb5e0b133a47f89fed19) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4c7ec56367..518f6249e9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -117,7 +117,6 @@ by the previous section */ #include "local.h" -#include "ubi_dLinkList.h" #include #ifdef POSIX_STDLIBH #include @@ -1126,6 +1125,7 @@ extern char *sys_errlist[]; #include "version.h" #include "smb.h" #include "nameserv.h" +#include "ubiqx/ubi_dLinkList.h" #include "proto.h" #include "byteorder.h" -- cgit From f1093ad693d1650bcc50b5c7dd9b5a0356088cde Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Thu, 30 Oct 1997 15:42:40 +0000 Subject: Makefiles for libraries. the dependencies aren't quite right, and i don't know how to sort them. make proto in each library directory. over-ride the make proto for ubiqx, so that it doesn't happen, but throws up a warning instead. (This used to be commit 93df2c62cc32191e88c0c4e615ac6077ec2b07c3) --- source3/include/includes.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 518f6249e9..055e633846 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1126,12 +1126,18 @@ extern char *sys_errlist[]; #include "smb.h" #include "nameserv.h" #include "ubiqx/ubi_dLinkList.h" -#include "proto.h" + #include "byteorder.h" #include "kanji.h" #include "charset.h" +/***** automatically generated prototypes *****/ +#include "rpc_pipes/rpc_proto.h" +#include "proto.h" + + + #ifndef S_IFREG #define S_IFREG 0100000 #endif -- cgit From 30c046901beb29d1cc3430bfad029ec3a3eaf06c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 31 Oct 1997 04:51:29 +0000 Subject: OSF1 doesn't define union semun either. (This used to be commit af7700aa2e3c736f86ae3217a424dfb0910f5f45) --- source3/include/includes.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 055e633846..92688dd004 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -319,14 +319,7 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_GETCWD #define USE_SETSID #define USE_SYSV_IPC - -union semun { - int val; - struct semid_ds *buf; - ushort *array; -}; - - +#define NO_SEMUN #ifndef REPLACE_GETPASS #define REPLACE_GETPASS #endif /* REPLACE_GETPASS */ @@ -469,6 +462,7 @@ char *mktemp(char *); /* No standard include */ #define NEED_AUTH_PARAMETERS #endif /* OSF1_ENH_SEC */ #define USE_SYSV_IPC +#define NO_SEMUN #endif @@ -1084,6 +1078,13 @@ struct spwd { /* fake shadow password structure */ #include #include #include +#ifdef NO_SEMUN +union semun { + int val; + struct semid_ds *buf; + unsigned short *array; +}; +#endif #endif #ifdef AFS_AUTH -- cgit From 88bd62c9b0c6d7fea06207a1ec160684e8aa0f51 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 31 Oct 1997 05:54:36 +0000 Subject: define NO_SEMUN for svr4 (This used to be commit a43fa71a5fa740ae8757989c4177f21d8193de94) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 92688dd004..794380d7d4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -436,6 +436,7 @@ extern struct passwd *getpwnam(); #define USE_GETCWD #define USE_SETSID #define USE_SYSV_IPC +#define NO_SEMUN #endif -- cgit From 56eece129efcd8717cfdc507b7d34a073b024d68 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 2 Nov 1997 03:10:42 +0000 Subject: got rid of redundent rpc_pipes/rpc_proto.h (This used to be commit 1a454f818841bf016ff04fd70cd73a5964d56f2e) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 794380d7d4..9481c9f24e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1135,7 +1135,6 @@ extern char *sys_errlist[]; #include "charset.h" /***** automatically generated prototypes *****/ -#include "rpc_pipes/rpc_proto.h" #include "proto.h" -- cgit From bd83f461a1a3f1ed610061681720b8923154c697 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 5 Nov 1997 12:21:45 +0000 Subject: add NO_SEMUN for HP I really wish you could say #ifndef "struct foo_struct" in C :-) (This used to be commit acffb39f1aea9816ece41d66e9369375e9aa7df4) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9481c9f24e..6572b583e2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -573,6 +573,7 @@ char *mktemp(char *); /* No standard include */ #define USE_SETSID #define USE_SETRES #define USE_SYSV_IPC +#define NO_SEMUN #define DEFAULT_PRINTING PRINT_HPUX /* Ken Weiss tells us that SIGCLD_IGNORE is not good for HPUX */ -- cgit From ba5086d03e3ec29e0c866d339d0283b520fc669f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Nov 1997 06:50:21 +0000 Subject: no asm/signal.h for linux as this is not portable add auto username from LOGNAME for smbtorture proto fix in ufc.c (This used to be commit f13dbdf307ccffc15a74e2ffa72da666e53a72b6) --- source3/include/includes.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6572b583e2..cada77e732 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -214,9 +214,6 @@ Here come some platform specific sections #include #include #include -#ifndef NO_ASMSIGNALH -#include -#endif #ifdef GLIBC2 #define _LINUX_C_LIB_VERSION_MAJOR 6 #include -- cgit From e94d5632392bb98d026ef2076702ef7b0870aea5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Dec 1997 05:22:24 +0000 Subject: put the default PRINTCAP_NAME def in includes.h not local.h so that it can see the SYSV definitions (This used to be commit e439115366804982af6faba75714dbe2626edead) --- source3/include/includes.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index cada77e732..5bfe024145 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1073,6 +1073,23 @@ struct spwd { /* fake shadow password structure */ #endif #endif +/* This defines the name of the printcap file. It is MOST UNLIKELY that + this will change BUT! Specifying a file with the format of a printcap + file but containing only a subset of the printers actually in your real + printcap file is a quick-n-dirty way to allow dynamic access to a subset + of available printers. +*/ +#ifndef PRINTCAP_NAME +#ifdef AIX +#define PRINTCAP_NAME "/etc/qconfig" +#elif defined(SYSV) +#define PRINTCAP_NAME "lpstat" +#else +#define PRINTCAP_NAME "/etc/printcap" +#endif +#endif + + #ifdef USE_SYSV_IPC #include #include -- cgit From 500069329a878cdf2173e24cf2419991ee6ce323 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 4 Dec 1997 07:48:06 +0000 Subject: added optonal MEM_MAN code (This used to be commit b524c8da5141e3e030e14b3a0167fa5c7ae91396) --- source3/include/includes.h | 47 ++-------------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5bfe024145..6c2b676b31 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1285,51 +1285,8 @@ extern int errno; #define strcpy(dest,src) StrCpy(dest,src) #endif - -/* possibly wrap the malloc calls */ -#if WRAP_MALLOC - -/* undo the old malloc def if necessary */ -#ifdef malloc -#define xx_old_malloc malloc -#undef malloc -#endif - -#define malloc(size) malloc_wrapped(size,__FILE__,__LINE__) - -/* undo the old realloc def if necessary */ -#ifdef realloc -#define xx_old_realloc realloc -#undef realloc -#endif - -#define realloc(ptr,size) realloc_wrapped(ptr,size,__FILE__,__LINE__) - -/* undo the old free def if necessary */ -#ifdef free -#define xx_old_free free -#undef free -#endif - -#define free(ptr) free_wrapped(ptr,__FILE__,__LINE__) - -/* and the malloc prototypes */ -void *malloc_wrapped(int,char *,int); -void *realloc_wrapped(void *,int,char *,int); -void free_wrapped(void *,char *,int); - -#endif - - -#if WRAP_MEMCPY -/* undo the old memcpy def if necessary */ -#ifdef memcpy -#define xx_old_memcpy memcpy -#undef memcpy -#endif - -#define memcpy(d,s,l) memcpy_wrapped(d,s,l,__FILE__,__LINE__) -void *memcpy_wrapped(void *d,void *s,int l,char *fname,int line); +#if MEM_MAN +#include "mem_man/mem_man.h" #endif #endif -- cgit From d1e796d8577a666e5ef14f9bb462c080300dca3e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 23 Dec 1997 07:15:59 +0000 Subject: Fixes to compile under OpenBSD from "Todd T. Fries" Jeremy. (This used to be commit 3c9292505914e2119fa7b1973c9fbbe1742262b2) --- source3/include/includes.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6c2b676b31..c99880cad3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -193,7 +193,7 @@ #include #endif -#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) +#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) && !defined(__OpenBSD__) #include #endif @@ -523,7 +523,21 @@ char *mktemp(char *); /* No standard include */ #define HAVE_GETGRNAM 1 #endif - +#ifdef __OpenBSD__ +#include +#include +#define NO_GETSPNAM +#define SIGNAL_CAST (void (*)()) +#define USE_DIRECT +#define REPLACE_INNETGR +#define HAVE_BZERO +#define HAVE_PATHCONF +#define HAVE_GETGRNAM 1 +#define HAVE_GETTIMEOFDAY +#define HAVE_MEMMOVE +#define USE_GETCWD +#define USE_SETSID +#endif #ifdef AIX #include -- cgit From c23ed625b22bfc765ba95cb7b8addf55625fea44 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 7 Jan 1998 06:21:56 +0000 Subject: includes.h: Added FreeBSD 3.x fixes. Added HPUX10.x fixes. interface.c: Added netmask fix. nmbd_nameregister.c: Fixed unitialised variable warnings. nmbd_winsproxy.c: Fixed unitialised variable warnings. nmbd_winsserver.c: Fixed DEC warnings. print_svid.c: Fixed DEC warnings. printing.c: Added LPRng fixes. Jeremy. (This used to be commit 28aff043c4a3693a0c20e87c7ce11eb4bf285b78) --- source3/include/includes.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c99880cad3..3dbe6780a5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -510,12 +510,16 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#if __FreeBSD__ >= 3 +#include +#else +#define USE_DIRECT +#endif #define SIGNAL_CAST (void (*)()) #define USE_SETVBUF #define USE_SETSID #define USE_GETCWD #define USE_WAITPID -#define USE_DIRECT #define HAVE_MEMMOVE #define HAVE_BZERO #define HAVE_GETTIMEOFDAY @@ -568,6 +572,7 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include /* needed for inet_ntoa proto */ #ifdef HPUX_10_TRUSTED #include #include -- cgit From fec28f2defa17974b2eaafdd10599cf37850ca16 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 16 Jan 1998 06:29:38 +0000 Subject: Makefile: Added new codepage - 866. charset.c: Supporting code for codepage 866. clientutil.c: Fix compile bug in little-used #define. includes.h: Supporting code for codepage 866. make_smbcodepage.c: Supporting code for codepage 866. pcap.c: Fix bug for lpstat. Jeremy. (This used to be commit 6040d7a39e5d5ab426905aa79b871df815fb9b62) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3dbe6780a5..2d2ff63f88 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1168,6 +1168,10 @@ extern char *sys_errlist[]; #include "kanji.h" #include "charset.h" +#ifndef MAXCODEPAGELINES +#define MAXCODEPAGELINES 256 +#endif + /***** automatically generated prototypes *****/ #include "proto.h" -- cgit From 55f400bd84f26027f5ec9b7fa06b22895de7557c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 22 Jan 1998 13:27:43 +0000 Subject: This is *not* a big change (although it looks like one). This is merely updating the Copyright statements from 1997 to 1998. It's a once a year thing :-). NO OTHER CHANGES WERE MADE. Jeremy. (This used to be commit b9c16977231efb274e08856f7f3f4408dad6d96c) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2d2ff63f88..f021fa952e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -4,7 +4,7 @@ Unix SMB/Netbios implementation. Version 1.9. Machine customisation and include handling - Copyright (C) Andrew Tridgell 1994-1997 + Copyright (C) Andrew Tridgell 1994-1998 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit From 89652787c3894c7a79345a2ea67a4de741a0f760 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 29 Jan 1998 08:25:46 +0000 Subject: Makefile: Fix for OSF1 typo. asyncdns.c: Fixes that went into 1.9.18p2 - allow unclocking of sigterm. chgpasswd.c: char -> unsigned char fixes. includes.h: AIX fix to get prototype for inet_ntoa. local.h: Tune size of shared memory based on MAX_OPEN_FILES. nmbd_mynames.c: Fix for nmbd repeated refresh bug. nmbd_responserecordsdb.c: Fix for nmbd repeated refresh bug. nmbd_winsserver.c: Fix for multi-homed registration optimisation. smb.h: Moved default shared memory size to local.h Jeremy. (This used to be commit fa5466805685d461564054d7d9947948fc56ae93) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f021fa952e..218ce19955 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -554,6 +554,7 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include /* needed for inet_ntoa proto */ #define SYSV #define USE_WAITPID #define USE_SIGBLOCK -- cgit From 5546e28e69b1a43dbb48e024e233d8ebf7fa667a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 7 Feb 1998 12:15:20 +0000 Subject: A small raft of changes, I will sync up with 1.9.18 also. chgpasswd.c: Fixed typo in debug message. includes.h: Fix include for aix. kanji.c: Added cap_to_sj as inverse of sj_to_cap. loadparm.c: local.h: password.c: Added code for "networkstation user login" parameter. - patch from Rob Nielsen . printing.c: Added further aix printing fixes. reply.c: Changed access time fetch to a function. trans2.c: Changed access time fetch to a function. time.c: Changed access time fetch to a function. server.c: Made NT redirector workaround final. util.c: Added debug for write_socket failing. Jeremy. (This used to be commit a031404623c22d62f8de035be2239f609af08112) --- source3/include/includes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 218ce19955..f9c29fd41d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -552,9 +552,12 @@ char *mktemp(char *); /* No standard include */ #include #include #include +/* According to AIX 4.1 man pages, inet_ntoa needs the following headers */ +#include +#include +#include #include #include -#include /* needed for inet_ntoa proto */ #define SYSV #define USE_WAITPID #define USE_SIGBLOCK -- cgit From 45dab9f06594777e96be5f4556e6bb386f68f309 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 26 Feb 1998 22:58:21 +0000 Subject: Makefile, password.c, includes.h: Added KRB4 patches from Johan Hedin nmbd_packets.c: Patch for aliased interfaces from Daniel Haun . Jeremy. (This used to be commit 60f6302b1972e49159bf6e1a838e691268e4399c) --- source3/include/includes.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f9c29fd41d..94bf23cef5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -299,9 +299,9 @@ typedef unsigned short mode_t; #include #include #include -#ifndef USE_LIBDES +#if !defined(USE_LIBDES) && !defined(KRB4_AUTH) #include -#endif /* USE_LIBDES */ +#endif /* !USE_LIBDES && !KRB4_AUTH */ extern int gettimeofday (struct timeval *, void *); extern int gethostname (char *name, int namelen); extern int innetgr (const char *, const char *, const char *, const char *); @@ -1140,6 +1140,10 @@ union semun { #include #endif +#ifdef KRB4_AUTH +#include +#endif + #ifdef NO_UTIMBUF struct utimbuf { time_t actime; -- cgit From 90cdd717f8352a3b3eacdc154dfb1f9ff2fabeaf Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 16 Mar 1998 18:31:09 +0000 Subject: includes.h: Addition of NetBSD 1.3 fix, fix for HPUX 9.x, 10.x zombie problem. password.c: Fix for Thursby to stop Dave clients failing in share mode security (this was their bug - they were interpreting the uid field in share mode which is explicitly denied by the spec but it's easier for us to fix it than them :-). Jeremy. (This used to be commit 39372d9e20803d32c0c5b87226a72b007978baad) --- source3/include/includes.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 94bf23cef5..c9a515af9a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -492,16 +492,22 @@ char *mktemp(char *); /* No standard include */ #endif -#ifdef NETBSD -#include +#ifdef NETBSD +#ifdef NetBSD1_3 +#include +#ifdef ALLOW_CHANGE_PASSWORD +#include +#endif /* ALLOW_CHANGE_PASSWORD */ +#else /* NetBSD1_3 */ +#include +#endif /* NetBSD1_3 */ #include /* you may not need this */ -#define NO_GETSPNAM +#define NO_GETSPNAM #define SIGNAL_CAST (void (*)()) #define USE_DIRECT #define REPLACE_INNETGR -#endif - +#endif #ifdef FreeBSD @@ -598,6 +604,7 @@ char *mktemp(char *); /* No standard include */ /* Ken Weiss tells us that SIGCLD_IGNORE is not good for HPUX */ /* #define SIGCLD_IGNORE */ +#define USE_SIGPROCMASK /* Needed to stop zombie processes on HPUX 9.x and 10.x.*/ #endif /* HPUX */ -- cgit From a4156f9b50c81fe40823cd8e32ec990690d3884c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 27 Mar 1998 19:59:14 +0000 Subject: chgpasswd.c, ipc.c, loadparm.c: Added boolean "unix password sync" parameter which allows the new change password code to change the unix password also. Defaults to OFF. includes.h: Added termios.h to FreeBSD to allow password changing. namequery.c: Fixed missing name parameters to debug statements. Jeremy. (This used to be commit 4ac50c0f0aa5af084ddad89b1f9baf6c2c1ddcb8) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c9a515af9a..e6dee108a5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -516,6 +516,7 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include #if __FreeBSD__ >= 3 #include #else -- cgit From 10fe54befa10b283269001fdf779b9938c9a3a2c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 31 Mar 1998 20:55:14 +0000 Subject: includes.h: Added semaphore fix for HPUX10.x server.c trans2.c: Added oplock deadlock bug fix. lib/rpc/server/srv_netlog.c: Made code that changes machine account password the default. Jeremy. (This used to be commit 3b56fbc11e9d1cb7d4930d9782238c2610cac30d) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e6dee108a5..5df76668c6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -606,6 +606,11 @@ char *mktemp(char *); /* No standard include */ not good for HPUX */ /* #define SIGCLD_IGNORE */ #define USE_SIGPROCMASK /* Needed to stop zombie processes on HPUX 9.x and 10.x.*/ +#ifdef HPUX10 +#ifdef SEMMSL +#undef SEMMSL +#endif /* SEMMSL */ +#endif /* HPUX10 */ #endif /* HPUX */ -- cgit From e300c0346ff92035ff9568b55b34469193e29769 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 10 Apr 1998 18:21:16 +0000 Subject: includes.h: Moved HPUX undefine of SEMMSL to where it actually does something. ipc.c: Added Luke's debug statement. locking_slow.c: Added FTRUNCATE_NEEDS_ROOT code for broken systems that need it (not sure what these are yet). membuffer.c ntdomain.h proto.h lib/rpc/include/rpc_dce.h lib/rpc/include/rpc_srvsvc.h lib/rpc/parse/parse_prs.c lib/rpc/parse/parse_rpc.c lib/rpc/server/srv_pipe_hnd.c lib/rpc/server/srv_util.c: Re-merge of Luke's NTDOM changes 'cos he's a lazy git with carpel tunnel syndrome :-). Jeremy. (This used to be commit 52e3966fbcf7b5fbdbc7cbe9ac0b453ab5bf3217) --- source3/include/includes.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5df76668c6..2ba069aa76 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -606,11 +606,6 @@ char *mktemp(char *); /* No standard include */ not good for HPUX */ /* #define SIGCLD_IGNORE */ #define USE_SIGPROCMASK /* Needed to stop zombie processes on HPUX 9.x and 10.x.*/ -#ifdef HPUX10 -#ifdef SEMMSL -#undef SEMMSL -#endif /* SEMMSL */ -#endif /* HPUX10 */ #endif /* HPUX */ @@ -1137,6 +1132,11 @@ union semun { unsigned short *array; }; #endif +#if defined(HPUX) && defined(HPUX10) +#ifdef SEMMSL +#undef SEMMSL +#endif /* SEMMSL */ +#endif /* HPUX && HPUX10 */ #endif #ifdef AFS_AUTH -- cgit From c0c2353b77021389480ddd2cab887ea8f31769ed Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Sat, 11 Apr 1998 13:02:11 +0000 Subject: Fix heaps of warnings when compiling with gcc under Digital UNIX. Include route.h and mbuf.h at a strategic point ... Wierd stuff really, because the Digital compiler does not complain either way, but GCC does. (This used to be commit 241fde3c713c91961b6bcb97ecb046ac2f3bb00b) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2ba069aa76..a1723a55c6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -182,6 +182,10 @@ #ifdef POSIX_H #include #else +#ifdef OSF1 +#include +#include +#endif #include #endif #endif -- cgit From cac6a060af598bf94e6414b06e7365ec51ca360e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 13 Apr 1998 19:24:06 +0000 Subject: Changes to allow Samba to be compiled with -Wstrict-prototypes with gcc. (Not a big change although it looks like it :-). Jeremy. (This used to be commit cd2613c57261456485fe4eeecfda209ada70de8e) --- source3/include/includes.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a1723a55c6..8cc2711e0a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -521,12 +521,13 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include #if __FreeBSD__ >= 3 #include #else #define USE_DIRECT #endif -#define SIGNAL_CAST (void (*)()) +#define SIGNAL_CAST (void (*)(int)) #define USE_SETVBUF #define USE_SETSID #define USE_GETCWD @@ -536,7 +537,15 @@ char *mktemp(char *); /* No standard include */ #define HAVE_GETTIMEOFDAY #define HAVE_PATHCONF #define HAVE_GETGRNAM 1 -#endif +#define QSORT_CAST (int (*)(const void *, const void *)) +#if !defined(O_SYNC) +#if defined(O_FSYNC) +#define O_SYNC O_FSYNC +#else /* defined(O_FSYNC) */ +#define O_SYNC 0 +#endif /* defined(O_FSYNC) */ +#endif /* !defined(O_SYNC) */ +#endif /* FreeBSD */ #ifdef __OpenBSD__ #include -- cgit From 6733e2b36e00ccbe8df363651ecc98ba42d53cee Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 18 Apr 1998 02:00:39 +0000 Subject: includes.h: Added John's redhat fix for QSORT_CAST. smbpass.c: Added lock depth code so calls to pw_file_lock() can be nested. Fixed codedump problems in add_smbpwd_entry(). smbpasswd.c: Removed all the code that manipulated the password file directly. Now *all* smbpasswd file changes are done through the interfaces defined in smbpass.c This should make the life of people adding alternate backend databases *much* easier. lib/rpc/server/srv_netlog.c: Removed debug messages used to debug machine password changing. Jeremy. (This used to be commit c9f61be08f3691a6421734d8b026a295d9cbd6ba) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8cc2711e0a..587d13bd40 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -226,6 +226,9 @@ Here come some platform specific sections #include #include #endif +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) +#endif /* QSORT_CAST */ #define SIGNAL_CAST (__sighandler_t) #define USE_GETCWD #define USE_SETSID -- cgit From e7ac86607c80912e55ac7179b100cea22749c16f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 25 Apr 1998 01:12:08 +0000 Subject: This looks like a big change but really isn't. It is changing the global variables "myname" and "myworkgroup" to "global_myname" and "global_myworkgroup" respectively. This is to make it very explicit when we are messing with a global (don't ask - it makes the domain client code much clearer :-). Jeremy. (This used to be commit 866406bfe399cf757c8275093dacd5ce4843afa0) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 587d13bd40..5fc2811981 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -383,6 +383,9 @@ char *getwd(char *); #define USE_WAITPID #define USE_SETSID #define USE_SYSV_IPC +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) +#endif /* QSORT_CAST */ #endif -- cgit From 5fa8775d9758254f6f4784a0e34c9b5b8bf18bdb Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Wed, 6 May 1998 17:43:44 +0000 Subject: jean-francois micouleau's well-alpha code for ldap password database stuff! he's going to hate me for checking this in so early, but... (This used to be commit ad9ba0a1cbac5c4e6cbcbcadefe8f1df72231f74) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5fc2811981..859603c29f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1212,6 +1212,11 @@ extern char *sys_errlist[]; #define MAXCODEPAGELINES 256 #endif +#ifdef USE_LDAP +#include "lber.h" +#include "ldap.h" +#endif + /***** automatically generated prototypes *****/ #include "proto.h" -- cgit From bb8706f4076ca1e0ba11b62014ebfc85a357e931 Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Fri, 8 May 1998 13:51:17 +0000 Subject: Se-submitting clitar.c/ I now only have one warning in my code which is the result of some code I have started working on but am not yet using in the code, along with a warning that is caused by one of the include files (a nested comment). I used -Wall -Wshadow -Wstrict-prototypes (This used to be commit 7b98fd5b69282320af700833c2d2720c42a382d8) --- source3/include/includes.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 859603c29f..e5076c6f39 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -205,6 +205,9 @@ #include #endif +#ifdef HAVE_REGEX_H +#include +#endif /*************************************************************************** @@ -1212,11 +1215,6 @@ extern char *sys_errlist[]; #define MAXCODEPAGELINES 256 #endif -#ifdef USE_LDAP -#include "lber.h" -#include "ldap.h" -#endif - /***** automatically generated prototypes *****/ #include "proto.h" -- cgit From 3dfc0c847240ac7e12c39f4ed9c31a888949ade1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 May 1998 06:38:36 +0000 Subject: changed to use slprintf() instead of sprintf() just about everywhere. I've implemented slprintf() as a bounds checked sprintf() using mprotect() and a non-writeable page. This should prevent any sprintf based security holes. (This used to be commit ee09e9dadb69aaba5a751dd20ccc6d587d841bd6) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e5076c6f39..44ed317ae9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -237,6 +237,7 @@ Here come some platform specific sections #define USE_SETSID #define HAVE_BZERO #define HAVE_MEMMOVE +#define HAVE_VSNPRINTF #define USE_SIGPROCMASK #define USE_WAITPID #define USE_SYSV_IPC -- cgit From f004d84f683673b7cb167320e3e78a3fcefdfd07 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 11 May 1998 15:56:01 +0000 Subject: ldap back-end database development Makefile: created PASSBD_OBJ group includes.h: added #ifdef USE_LDAP to #include headers ldap.c: - renamed "_machine" to "_trust" everywhere. - added sam_passwd support routines - removed get_ldappwd_entry function: replaced with get_sampwd_entry - removed getldappwnam/uid: replaced with getsampwnam/uid - other messing about bits which are probably going to annoy the hell out of jean-francois (sorry!) mkproto.awk: - added stuff to wrap ldap.c protos with #ifdef USE_LDAP - added uid_t and gid_t return results to the prototype generation passdb.c: - created getsam21pwent, add_sam21pwd_entry, mod_sam21pwd_entry. - modified getsampwnam/uid and created getsam21pwnam/rid functions to replace the local get_smbpwd_entry() and get_ldappwd_entry() functions, which jeremy didn't like anyway because they were dual-purpose. - added utility routines which are or may be useful to all the password database routines. password.c: - renamed "machine_" to "trust_" everywhere. smbpass.c: - removed get_smbpwd_entry function: replaced it with get_sampwd_entry functions in passdb.c - moved code that decoded acct_ctrl into passdb.c - moved encode_acct_ctrl into passdb.c - removed getsmbpwnam/uid: replaced with getsampwnam/uid - renamed "machine_" to "trust_" everywhere. smbpasswd.c: - renamed "machine_" to "trust_" everywhere. util.c: - moved gethexpwd function into passdb.c lib/rpc/server/srv_util.c: - moved user_rid_to_uid, group_rid_to_rid etc etc into passdb.c (This used to be commit 673ab50c4c2c25db355d90efde3a6bfbb4d8369e) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 44ed317ae9..d741e07c28 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1180,6 +1180,11 @@ union semun { #include #endif +#ifdef USE_LDAP +#include +#include +#endif + #ifdef NO_UTIMBUF struct utimbuf { time_t actime; -- cgit From f888868f46a5418bac9ab528497136c152895305 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 12 May 1998 00:55:32 +0000 Subject: This is a security audit change of the main source. It removed all ocurrences of the following functions : sprintf strcpy strcat The replacements are slprintf, safe_strcpy and safe_strcat. It should not be possible to use code in Samba that uses sprintf, strcpy or strcat, only the safe_equivalents. Once Andrew has fixed the slprintf implementation then this code will be moved back to the 1.9.18 code stream. Jeremy. (This used to be commit 2d774454005f0b54e5684cf618da7060594dfcbb) --- source3/include/includes.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d741e07c28..d345ea38de 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -332,6 +332,10 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define REPLACE_GETPASS #endif /* REPLACE_GETPASS */ #define USE_SIGPROCMASK +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) +#endif /* QSORT_CAST */ +#define HAVE_VSNPRINTF #endif @@ -547,6 +551,7 @@ char *mktemp(char *); /* No standard include */ #define HAVE_GETTIMEOFDAY #define HAVE_PATHCONF #define HAVE_GETGRNAM 1 +#define HAVE_VSNPRINTF #define QSORT_CAST (int (*)(const void *, const void *)) #if !defined(O_SYNC) #if defined(O_FSYNC) @@ -624,6 +629,7 @@ char *mktemp(char *); /* No standard include */ #define USE_SETRES #define USE_SYSV_IPC #define NO_SEMUN +#define HAVE_VALLOC #define DEFAULT_PRINTING PRINT_HPUX /* Ken Weiss tells us that SIGCLD_IGNORE is not good for HPUX */ @@ -1353,12 +1359,29 @@ extern int errno; #define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n) #endif -#ifndef strcpy -#define strcpy(dest,src) StrCpy(dest,src) -#endif +#ifdef strcpy +#undef strcpy +#endif /* strcpy */ +#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; + +#ifdef strcat +#undef strcat +#endif /* strcat */ +#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; + +#ifdef sprintf +#undef sprintf +#endif /* sprintf */ +#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__>; + +#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) +#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) +#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) +#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) #if MEM_MAN #include "mem_man/mem_man.h" -#endif +#endif /* MEM_MAN */ + #endif -- cgit From ee9a61841ac10d32d869a3893bc690c66f2bb1bb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 12 May 1998 22:11:24 +0000 Subject: includes.h: SunOS doesn't have strcasecmp, solaris versions prior to 2.6 don't have vsnprintf. locking_slow.c: slight tidy. make_smbcodepage.c: Use safe_strcpy instead of pstrcpy. nmbd_winsserver.c: Use pstrcpy instead of fstrcpy. smbmount.c: Fixed reported bug. util.c: Removed old fstrcpy/fstrcat functions. Jeremy. (This used to be commit f257d2e4bafd3944cca737699913a8d868279ca6) --- source3/include/includes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d345ea38de..ae073d1df8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -263,6 +263,7 @@ Here come some platform specific sections #include #include #include +#include #include #include #include @@ -291,6 +292,7 @@ typedef unsigned short mode_t; #define USE_SYSV_IPC /* SunOS doesn't have POSIX atexit */ #define atexit on_exit +#define NOSTRCASECMP #endif @@ -335,7 +337,6 @@ extern int innetgr (const char *, const char *, const char *, const char *); #ifndef QSORT_CAST #define QSORT_CAST (int (*)(const void *, const void *)) #endif /* QSORT_CAST */ -#define HAVE_VSNPRINTF #endif @@ -1372,7 +1373,7 @@ extern int errno; #ifdef sprintf #undef sprintf #endif /* sprintf */ -#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__>; +#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; #define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) #define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) -- cgit From 329fe213439a4ef253e0b16221f98d2ade032e06 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 13 May 1998 18:36:12 +0000 Subject: Fixed up HPUX entry. Jeremy. (This used to be commit a7afda2e4ecab226c90db023293f5d460e81ae2f) --- source3/include/includes.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ae073d1df8..2bb154554f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -619,7 +619,10 @@ char *mktemp(char *); /* No standard include */ #define NEED_AUTH_PARAMETERS #endif #define SIGNAL_CAST (void (*)(__harg)) -#ifndef HPUX10 /* This is only needed for HPUX 9.x */ +#ifdef HPUX10 +#include +#else /* HPUX10 */ +/* This is only needed for HPUX 9.x */ #define SELECT_CAST (int *) #endif /* HPUX10 */ #define SYSV @@ -630,7 +633,6 @@ char *mktemp(char *); /* No standard include */ #define USE_SETRES #define USE_SYSV_IPC #define NO_SEMUN -#define HAVE_VALLOC #define DEFAULT_PRINTING PRINT_HPUX /* Ken Weiss tells us that SIGCLD_IGNORE is not good for HPUX */ -- cgit From ea92374814a5b64edd0756e46153dcb70ef8d2d6 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Thu, 14 May 1998 11:16:18 +0000 Subject: robert frank - some Next3 compilation errors detected. (This used to be commit da3d9602c71094df4dba0edd45ade71555f5e97b) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2bb154554f..acae03c56b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -710,7 +710,6 @@ char *mktemp(char *); /* No standard include */ #include #include #include -#define bzero(b,len) memset(b,0,len) #define NO_UTIMBUF #include #define NOSTRDUP @@ -722,6 +721,7 @@ char *mktemp(char *); /* No standard include */ #define SIGNAL_CAST (void (*)(int)) #define WAIT3_CAST1 (union wait *) #define HAVE_GMTOFF +#define O_NONBLOCK O_NDELAY #endif -- cgit From 32954eb9e9eb1e3613ad55cb1afd5e19e81b5da8 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 18 May 1998 11:54:00 +0000 Subject: Makefile: - added nisppass.c and NISPLUS_FLAGS includes.h: - renamed USE_LDAP to USE_LDAP_DB. renamed NISPLUS to USE_NISPLUS_DB. added default define of USE_SMBPASS_DB. - removed ldap headers: they are local only to ldap.c ldap.c : - made all ldap-specific functions static. - added dummy sam21 functions loadparm.c : - renamed NISPLUS to NISPLUS_HOME mkproto.awk - commented out ldap-specific #ifdef generation code: it's not needed now that ldap-specific functions in ldap.c are static nisppass.c : - first attempt at an add function from (This used to be commit f215d375f0f1e12894c2a9e86bd28d4776d337c1) --- source3/include/includes.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index acae03c56b..49fb30e786 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1068,6 +1068,10 @@ typedef int mode_t; end of the platform specific sections ********************************************************************/ +#if (!defined(USE_LDAP_DB) && !defined(USE_NISPLUS_DB)) +#define USE_SMBPASS_DB +#endif + #if defined(USE_MMAP) || defined(FAST_SHARE_MODES) #include #endif @@ -1189,11 +1193,6 @@ union semun { #include #endif -#ifdef USE_LDAP -#include -#include -#endif - #ifdef NO_UTIMBUF struct utimbuf { time_t actime; -- cgit From 6580fa6b5ce023a6bb7ce8aa9b8ab4b5c524f08b Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Fri, 22 May 1998 05:16:27 +0000 Subject: Removed all ubiqx includes from includes.h. So far, this was only a problem for dir.h, which I've fixed. Andrew did not add includes.h to the ubiqx headers, which is good because it would cause internal conflicts within the ubiqx tree modules. It's also bad because the definitions and includes that are part of includes.h are now in the ubiqx C files, but not in the header files. So, if includes.h were to redefine int, for example, the new definition would be in the ubiqx C files, but not in the headers. So, until Andrew and I can work something out that we both agree upon, there are three basic rules: 1) Don't include includes.h in the ubiqx headers. Problems may arise. 2) The ubiqx headers must follow includes.h in any Samba module that uses them. This can and should all be worked out. We just have to talk about it. Chris -)----- (This used to be commit 2b6be7084df4ddfca3a1ab7b73304007c5f9d0aa) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 49fb30e786..eda5afbe4e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1218,7 +1218,6 @@ extern char *sys_errlist[]; #include "version.h" #include "smb.h" #include "nameserv.h" -#include "ubiqx/ubi_dLinkList.h" #include "byteorder.h" -- cgit From cfc43a5a2fe65cccd9902bc28441da6c8d29f6a0 Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Fri, 22 May 1998 07:46:39 +0000 Subject: I've put the ubiqx headers back into includes.h, and removed them from dir.c & mangle.c. This was possible after I checked the tree code to make sure that the tree code did not reference functions by macro name. Also, note that the AVL module has been removed to prevent conflict with the SplayTree macro defines. Chris -)----- (This used to be commit a1f4c8567c3c5264cbfa99867fa894cafab7da81) --- source3/include/includes.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index eda5afbe4e..00f4e7ee0f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1385,4 +1385,12 @@ extern int errno; #endif /* MEM_MAN */ -#endif +/* -------------------------------------------------------------------------- ** + * Lists, trees, and caches... + */ +#include "ubiqx/ubi_sLinkList.h" +#include "ubiqx/ubi_dLinkList.h" +#include "ubiqx/ubi_SplayTree.h" +#include "ubiqx/ubi_Cache.h" + +#endif /* _INCLUDES_H */ -- cgit From 52c69766ea495f08a907c6ca76b1cef8df8c5d7c Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Wed, 3 Jun 1998 21:38:51 +0000 Subject: It occurred to me that the samba includes.h file should be included in the header files used by the ubiqx modules, instead of being hidden in the .c files. This would ensure that anything in includes.h would be "seen" by the ubiqx headers. I also had to put an #ifdef around the includes for ubi_SplayTree.h and ubi_Cache.h in includes.h to prevent the header of the descendant type from being included before its parent type. Chris -)----- (This used to be commit e30a7e023b7491c01e052ae3dbd1788f84075413) --- source3/include/includes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 00f4e7ee0f..5054c2ee5b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1386,11 +1386,14 @@ extern int errno; /* -------------------------------------------------------------------------- ** - * Lists, trees, and caches... + * Lists, trees, and caching... */ #include "ubiqx/ubi_sLinkList.h" #include "ubiqx/ubi_dLinkList.h" + +#ifndef UBI_BINTREE_H #include "ubiqx/ubi_SplayTree.h" #include "ubiqx/ubi_Cache.h" +#endif /* UBI_BINTREE_H */ #endif /* _INCLUDES_H */ -- cgit From a1c66b009ff2d6ac16b43f2af8eeaea67abb6414 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 4 Jun 1998 00:49:32 +0000 Subject: includes.h: Fixes for NetBSD and BSDI. smbpass.c: Fixed irix warnings. Jeremy. (This used to be commit 2caefb35ff56dba67968d04755d74238a38ba29d) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5054c2ee5b..74000a83ba 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -508,6 +508,7 @@ char *mktemp(char *); /* No standard include */ #include #define SIGNAL_CAST (void (*)()) #define USE_DIRECT +#define QSORT_CAST (int (*)(const void *, const void *)) #endif @@ -521,6 +522,8 @@ char *mktemp(char *); /* No standard include */ #include #endif /* NetBSD1_3 */ #include +#include +#include /* you may not need this */ #define NO_GETSPNAM #define SIGNAL_CAST (void (*)()) -- cgit From ae260b9688676afc712fec0890b3cd79dfb53331 Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Mon, 8 Jun 1998 20:07:40 +0000 Subject: Moved the ubiqx stuff above nameserv.h so that ubiqx typedefs could be seen by the nameserve.h header. (This used to be commit 530b54b8a2234a72d7a12606bff38648e56c5c1c) --- source3/include/includes.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 74000a83ba..4164d408c9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1218,6 +1218,12 @@ extern char *sys_errlist[]; #define MAXHOSTNAMELEN 255 #endif +/* Lists, trees, caching, datbase... */ +#include "ubiqx/ubi_dLinkList.h" +#ifndef UBI_BINTREE_H +#include "ubiqx/ubi_Cache.h" +#endif /* UBI_BINTREE_H */ + #include "version.h" #include "smb.h" #include "nameserv.h" @@ -1387,16 +1393,4 @@ extern int errno; #include "mem_man/mem_man.h" #endif /* MEM_MAN */ - -/* -------------------------------------------------------------------------- ** - * Lists, trees, and caching... - */ -#include "ubiqx/ubi_sLinkList.h" -#include "ubiqx/ubi_dLinkList.h" - -#ifndef UBI_BINTREE_H -#include "ubiqx/ubi_SplayTree.h" -#include "ubiqx/ubi_Cache.h" -#endif /* UBI_BINTREE_H */ - #endif /* _INCLUDES_H */ -- cgit From e6e4a63113b756ac637e2584e31e2f2d0f92b4d0 Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Thu, 11 Jun 1998 04:40:14 +0000 Subject: Removed directory-relative include references. This required that I add a -I$(srcdir)ubiqx to CFLAGS in the Makefile. It might be better to create a UBIDIR value. What would people like to see? Chris -)----- (This used to be commit 7fb9cf4d57eb6ec8f22bc62a7a38d4d71dfaadc6) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4164d408c9..98854bee82 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1219,9 +1219,9 @@ extern char *sys_errlist[]; #endif /* Lists, trees, caching, datbase... */ -#include "ubiqx/ubi_dLinkList.h" +#include "ubi_dLinkList.h" #ifndef UBI_BINTREE_H -#include "ubiqx/ubi_Cache.h" +#include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ #include "version.h" -- cgit From 5b5eb35c91ec400a25f6e6cf3eec421bd9560d50 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 13 Jun 1998 03:04:00 +0000 Subject: Makefile: Added ubi_sLinkList.o as the groupname.o file needs it. Added groupname.o includes.h: Added ubi_sLinkList.h include. loadparm.c: Added groupname map parameter. password.c: Fix HPUX big_crypt. username.c: New user_in_list() code. Moved groupname map code to groupname.c lib/rpc/server/srv_util.c: Added lookup_wellknown_sid_from_name(). New groupname map stuff. Note that nothing currently uses this but at compiles ok. Jeremy. (This used to be commit beef636a4d772457816ef068c62ea965d07131f6) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 98854bee82..dae97b121b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1219,6 +1219,7 @@ extern char *sys_errlist[]; #endif /* Lists, trees, caching, datbase... */ +#include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #ifndef UBI_BINTREE_H #include "ubi_Cache.h" -- cgit From 644fbaaf9ba38a5f3d60f27f7110e755b20d31e7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 15 Jun 1998 18:19:54 +0000 Subject: Makefile: smbumount.c: Added fixes to compile under Linux. includes.h: Added SunOS 4.x QSORT_CAST fix. reply.c: Fixed user name mapping function for security=server, security=domain. Jeremy. (This used to be commit 21ca6bfb3ba3927efaf7eeff4325976d41489be2) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index dae97b121b..ea09dcb367 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -293,6 +293,9 @@ typedef unsigned short mode_t; /* SunOS doesn't have POSIX atexit */ #define atexit on_exit #define NOSTRCASECMP +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) +#endif /* QSORT_CAST */ #endif -- cgit From 139a34157eba50f70c86f2dd07fb384a7cbaf9cc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 1 Jul 1998 21:49:49 +0000 Subject: includes.h: AIX fix. nttrans.c: More NT SMB work. smb.h: More NT SMB defines. trans2.c: Change call response as I now have docs on what the flags mean. #ifdef it with JRATEST until I'm sure it's ok though. Jeremy. (This used to be commit ce2503fddd7ef9eed89e1a63fd834f13432a9cd6) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ea09dcb367..6eab1a1641 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -600,6 +600,8 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#include +#define HAVE_GETGRNAM 1 #define SYSV #define USE_WAITPID #define USE_SIGBLOCK -- cgit From 734d66bb00d3eea3c4b07703c92b17a4afbabeb0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 7 Jul 1998 19:25:46 +0000 Subject: includes.h: Fixes for QNX 4.x. Jeremy. (This used to be commit 6055be064ec1e9416bb9a7cd97a11976fb336fb6) --- source3/include/includes.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6eab1a1641..a821ce181f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -89,6 +89,8 @@ #ifdef __386__ #define __i386__ #endif +#define SHADOW_PWD +#define NO_GETSPNAM #endif #ifdef NEWS42 @@ -959,8 +961,11 @@ extern char *getpass(char *); #endif #ifdef QNX +#include #define STATFS4 #include +/* Override QNX size of 32 to be 255 */ +#define FD_SETSIZE 255 #include #include #include @@ -1106,7 +1111,7 @@ extern char *getsmbpass(char *); #endif /* Now for some other grungy stuff */ -#ifdef NO_GETSPNAM +#if defined(NO_GETSPNAM) && !defined(QNX) struct spwd { /* fake shadow password structure */ char *sp_pwdp; }; -- cgit From dc44d77c7fd3427b1313e8ee2d7929fb7778148f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 16 Jul 1998 22:46:06 +0000 Subject: Makefile: Added nttrans.o includes.h: Added termios.h for AIX. nttrans.c: Working NT SMB calls ! pipes.c: Use strequal instead of strcmp. server.c: Use #defines rather than numbers. smb.h: Updated NT SMB #defines. Jeremy. (This used to be commit 3e5cada9885059e9926eb6a56d350c4b1b53d245) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a821ce181f..69692e5847 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -596,6 +596,9 @@ char *mktemp(char *); /* No standard include */ #include #include #include +#ifdef ALLOW_CHANGE_PASSWORD +#include +#endif /* ALLOW_CHANGE_PASSWORD */ /* According to AIX 4.1 man pages, inet_ntoa needs the following headers */ #include #include -- cgit From 781c9e50820e3bc2b11e15bbff2f16b6ad74f26a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 22 Jul 1998 01:31:59 +0000 Subject: includes.h: Added feature type USE_GRANTPT for pty code. chgpasswd.c: Updated to use USE_GRANTPT feature definition. Jeremy. (This used to be commit 953c5dbbae8c1370e5988619746b508f26cb0390) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 69692e5847..d72595b6b4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -342,6 +342,7 @@ extern int innetgr (const char *, const char *, const char *, const char *); #ifndef QSORT_CAST #define QSORT_CAST (int (*)(const void *, const void *)) #endif /* QSORT_CAST */ +#define USE_GRANTPT #endif @@ -387,16 +388,18 @@ char *getwd(char *); #include #include #include +#include #define USE_WAITPID #define NETGROUP #ifndef SYSV #define SYSV -#endif +#endif /* SYSV */ #define SIGNAL_CAST (void (*)()) #define USE_STATVFS #define USE_WAITPID #define USE_SETSID #define USE_SYSV_IPC +#define USE_GRANTPT #ifndef QSORT_CAST #define QSORT_CAST (int (*)(const void *, const void *)) #endif /* QSORT_CAST */ @@ -458,6 +461,7 @@ extern struct passwd *getpwnam(); #define USE_SETSID #define USE_SYSV_IPC #define NO_SEMUN +#define USE_GRANTPT #endif -- cgit From 64578c0589a3a741f81fb55c16eeb882128da00b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Jul 1998 03:08:05 +0000 Subject: merge from the autoconf2 branch to the main branch (This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21) --- source3/include/includes.h | 1426 ++++++++------------------------------------ 1 file changed, 233 insertions(+), 1193 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d72595b6b4..b63787fd5e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -20,1221 +20,274 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - This file does all the #includes's. This makes it easier to - port to a new unix. Hopefully a port will only have to edit the Makefile - and add a section for the new unix below. -*/ - - -/* the first OS dependent section is to setup what includes will be used. - the main OS dependent section comes later on -*/ - -#ifdef ALTOS -#define NO_UTIMEH -#endif - -#ifdef MIPS -#define POSIX_H -#define NO_UTIMEH -#endif -#ifdef sun386 -#define NO_UTIMEH -#endif +#include "config.h" +#include "local.h" -#ifdef NEXT2 -#define NO_UTIMEH +#ifdef AIX +#define DEFAULT_PRINTING PRINT_AIX #endif -#ifdef NEXT3_0 -#define NO_UTIMEH -#define NO_UNISTDH +#ifdef HPUX +#define DEFAULT_PRINTING PRINT_HPUX #endif -#ifdef APOLLO -#define NO_UTIMEH -#define NO_SYSMOUNTH -#define NO_UNISTDH +#ifdef QNX +#define DEFAULT_PRINTING PRINT_QNX #endif -#ifdef AIX -#define NO_SYSMOUNTH +#ifdef SUNOS4 +#define REPLACE_GETPASS +/* on SUNOS4 termios.h conflicts with sys/ioctl.h */ +#undef HAVE_TERMIOS_H #endif -#ifdef M88K_R3 -#define SVR3H -#define NO_RESOURCEH +#ifdef SUNOS5 +#define REPLACE_GETPASS #endif -#ifdef DNIX -#define NO_SYSMOUNTH -#define NO_NETIFH -#define NO_RESOURCEH -#define PRIME_NMBD 0 -#define NO_SETGROUPS -#endif +#include -#ifdef ISC -#define SYSSTREAMH -#define NO_RESOURCEH +#ifdef HAVE_UNISTD_H +#include #endif +#include +#include -#ifdef QNX -#define NO_RESOURCEH -#define NO_SYSMOUNTH -#define USE_MMAP 1 -#ifdef __386__ - #define __i386__ -#endif -#define SHADOW_PWD -#define NO_GETSPNAM +#ifdef HAVE_SYS_PARAM_H +#include #endif -#ifdef NEWS42 -#define NO_UTIMEH -#define NO_STRFTIME -#define NO_UTIMBUF -#define REPLACE_MKTIME -#define NO_TM_NAME +#ifdef HAVE_STDLIB_H +#include #endif -#ifdef OS2 -#define NO_SYSMOUNTH -#define NO_NETIFH +#ifdef HAVE_SYS_SOCKET_H +#include #endif -#ifdef LYNX -#define NO_SYSMOUNTH +#ifdef HAVE_STRING_H +#include #endif - -#if (defined(SHADOW_PWD)||defined(OSF1_ENH_SEC)||defined(SecureWare)||defined(PWDAUTH)) -#define PASSWORD_LENGTH 16 +#ifdef HAVE_MALLOC_H +#include #endif -/* here is the general includes section - with some ifdefs generated - by the previous section -*/ -#include "local.h" -#include -#ifdef POSIX_STDLIBH -#include -#else -#include -#endif -#include +#ifdef TIME_WITH_SYS_TIME +#include #include -#ifndef NO_UTIMEH -#include -#endif -#include - -#ifdef SVR3H -#include -#include -#include -#include -#include -#endif - -#include -#ifdef AXPROC -#include -#endif -#include -#include -#ifdef POSIX_H -#include -#include -#include #else +#ifdef HAVE_SYS_TIME_H #include -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#ifndef NO_RESOURCEH -#include -#endif -#ifndef NO_SYSMOUNTH -#include -#endif -#include -#ifdef __STDC__ -#include #else -#include -#endif -#ifndef NO_UNISTDH -#include +#include #endif -#include -#ifdef SYSSTREAMH -#include #endif -#ifndef NO_NETIFH -#ifdef POSIX_H -#include + +#ifdef HAVE_FCNTL_H +#include #else -#ifdef OSF1 -#include -#include -#endif -#include +#ifdef HAVE_SYS_FCNTL_H +#include #endif #endif -#if defined(GETPWANAM) -#include -#include -#include -#include -#endif +#include -#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) && !defined(__OpenBSD__) -#include +#ifdef HAVE_LIMITS_H +#include #endif -#ifdef SYSLOG -#include +#ifdef HAVE_SYS_IOCTL_H +#include #endif -#ifdef HAVE_REGEX_H -#include +#ifdef HAVE_SYS_FILIO_H +#include #endif +#include -/*************************************************************************** -Here come some platform specific sections -***************************************************************************/ - - -#ifdef LINUX -#include -#include -#include -#include -#include -#ifdef GLIBC2 -#define _LINUX_C_LIB_VERSION_MAJOR 6 -#include -#include -#include -#include -#include -#endif -#ifndef QSORT_CAST -#define QSORT_CAST (int (*)(const void *, const void *)) -#endif /* QSORT_CAST */ -#define SIGNAL_CAST (__sighandler_t) -#define USE_GETCWD -#define USE_SETSID -#define HAVE_BZERO -#define HAVE_MEMMOVE -#define HAVE_VSNPRINTF -#define USE_SIGPROCMASK -#define USE_WAITPID -#define USE_SYSV_IPC -#if 0 -/* SETFS disabled until we can check on some bug reports */ -#if _LINUX_C_LIB_VERSION_MAJOR >= 5 -#define USE_SETFS -#endif -#endif -#ifdef SHADOW_PWD -#if _LINUX_C_LIB_VERSION_MAJOR < 5 -#ifndef crypt -#define crypt pw_encrypt -#endif -#endif -#endif -#endif - -#ifdef SUNOS4 -#define SIGNAL_CAST (void (*)(int)) -#include -#include -#include -#include -#include -#include -#include +#ifdef HAVE_SYS_WAIT_H #include -#include -/* #include */ -#ifdef sun386 -#define NO_STRFTIME -#define NO_UTIMBUF -#define mktime timelocal -typedef unsigned short mode_t; -#else -#include -#define NO_STRERROR #endif -#ifndef REPLACE_GETPASS -#define REPLACE_GETPASS -#endif -#ifndef BSD_TERMIO -#define BSD_TERMIO -#endif -#ifndef USE_SIGPROCMASK -#define USE_SIGPROCMASK -#endif -#ifndef USE_WAITPID -#define USE_WAITPID +#ifdef HAVE_CTYPE_H +#include #endif -#define USE_SYSV_IPC -/* SunOS doesn't have POSIX atexit */ -#define atexit on_exit -#define NOSTRCASECMP -#ifndef QSORT_CAST -#define QSORT_CAST (int (*)(const void *, const void *)) -#endif /* QSORT_CAST */ +#ifdef HAVE_GRP_H +#include #endif - - -#ifdef SUNOS5 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if !defined(USE_LIBDES) && !defined(KRB4_AUTH) -#include -#endif /* !USE_LIBDES && !KRB4_AUTH */ -extern int gettimeofday (struct timeval *, void *); -extern int gethostname (char *name, int namelen); -extern int innetgr (const char *, const char *, const char *, const char *); -#define USE_SETVBUF -#define SIGNAL_CAST (void (*)(int)) -#ifndef SYSV -#define SYSV -#endif -#define USE_WAITPID -#define REPLACE_STRLEN -#define USE_STATVFS -#define USE_GETCWD -#define USE_SETSID -#define USE_SYSV_IPC -#define NO_SEMUN -#ifndef REPLACE_GETPASS -#define REPLACE_GETPASS -#endif /* REPLACE_GETPASS */ -#define USE_SIGPROCMASK -#ifndef QSORT_CAST -#define QSORT_CAST (int (*)(const void *, const void *)) -#endif /* QSORT_CAST */ -#define USE_GRANTPT +#ifdef HAVE_SYS_ID_H +#include #endif +#include -#ifdef ULTRIX -#include -#include -#include -#include -#ifdef ULTRIX_AUTH -#include -#endif -char *getwd(char *); -#define NOSTRDUP -#ifdef __STDC__ -#define SIGNAL_CAST (void(*)(int)) -#endif -#define USE_DIRECT -#define USE_WAITPID +#ifdef HAVE_UTIME_H +#include #endif -#ifdef SGI4 -#include -#include -#include -#include -#ifndef SYSV -#define SYSV -#endif -#define SIGNAL_CAST (void (*)()) -#define STATFS4 -#define USE_WAITPID -#define USE_DIRECT -#define USE_SETSID -#define USE_SYSV_IPC +#ifdef HAVE_SYS_SELECT_H +#include #endif -#if defined(SGI5) || defined(SGI6) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#define USE_WAITPID -#define NETGROUP -#ifndef SYSV -#define SYSV -#endif /* SYSV */ -#define SIGNAL_CAST (void (*)()) -#define USE_STATVFS -#define USE_WAITPID -#define USE_SETSID -#define USE_SYSV_IPC -#define USE_GRANTPT -#ifndef QSORT_CAST -#define QSORT_CAST (int (*)(const void *, const void *)) -#endif /* QSORT_CAST */ +#ifdef HAVE_SYS_MODE_H +/* apparently AIX needs this for S_ISLNK */ +#ifndef S_ISLNK +#include #endif - - -#ifdef MIPS -#include -#include -#include -#include -#include -#include -#include -#define SIGNAL_CAST (void (*)()) -typedef int mode_t; -extern struct group *getgrnam(); -extern struct passwd *getpwnam(); -#define STATFS4 -#define NO_STRERROR -#define REPLACE_STRSTR -#endif /* MIPS */ - - - -#ifdef DGUX -#include -#include -#include -#include -#include -#include -#define SYSV -#define USE_WAITPID -#define SIGNAL_CAST (void (*)(int)) -#define STATFS4 -#define USE_GETCWD #endif - -#ifdef SVR4 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#define SYSV -#define USE_WAITPID -#define SIGNAL_CAST (void (*)(int)) -#define USE_STATVFS -#define USE_GETCWD -#define USE_SETSID -#define USE_SYSV_IPC -#define NO_SEMUN -#define USE_GRANTPT +#ifdef HAVE_GLOB +#include #endif - -#ifdef OSF1 -#include -#include -#include -char *getwd(char *); -char *mktemp(char *); /* No standard include */ -#include -#include /* both for inet_ntoa */ -#define SIGNAL_CAST ( void (*) (int) ) -#define STATFS3 -#define USE_F_FSIZE -#define USE_SETSID -#include -#ifdef OSF1_ENH_SEC #include -#include -#include -#include -#include -#define PASSWORD_LENGTH 16 -#define NEED_AUTH_PARAMETERS -#endif /* OSF1_ENH_SEC */ -#define USE_SYSV_IPC -#define NO_SEMUN -#endif - - -#ifdef CLIX -#include -#define SIGNAL_CAST (void (*)()) -#include -#include -#include -#define NO_EID -#define USE_WAITPID -#define STATFS4 -#define NO_FSYNC -#define USE_GETCWD -#define USE_SETSID -#ifndef REPLACE_GETPASS -#define REPLACE_GETPASS -#endif /* REPLACE_GETPASS */ -#define NO_GETRLIMIT -#endif /* CLIX */ - - - -#ifdef BSDI -#include -#include -#define SIGNAL_CAST (void (*)()) -#define USE_DIRECT -#define QSORT_CAST (int (*)(const void *, const void *)) -#endif - - -#ifdef NETBSD -#ifdef NetBSD1_3 -#include -#ifdef ALLOW_CHANGE_PASSWORD -#include -#endif /* ALLOW_CHANGE_PASSWORD */ -#else /* NetBSD1_3 */ -#include -#endif /* NetBSD1_3 */ -#include -#include -#include -/* you may not need this */ -#define NO_GETSPNAM -#define SIGNAL_CAST (void (*)()) -#define USE_DIRECT -#define REPLACE_INNETGR -#endif - +#include -#ifdef FreeBSD -#include -#include -#include -#include -#include -#include -#include -#if __FreeBSD__ >= 3 -#include +#ifdef HAVE_STDARG_H +#include #else -#define USE_DIRECT -#endif -#define SIGNAL_CAST (void (*)(int)) -#define USE_SETVBUF -#define USE_SETSID -#define USE_GETCWD -#define USE_WAITPID -#define HAVE_MEMMOVE -#define HAVE_BZERO -#define HAVE_GETTIMEOFDAY -#define HAVE_PATHCONF -#define HAVE_GETGRNAM 1 -#define HAVE_VSNPRINTF -#define QSORT_CAST (int (*)(const void *, const void *)) -#if !defined(O_SYNC) -#if defined(O_FSYNC) -#define O_SYNC O_FSYNC -#else /* defined(O_FSYNC) */ -#define O_SYNC 0 -#endif /* defined(O_FSYNC) */ -#endif /* !defined(O_SYNC) */ -#endif /* FreeBSD */ - -#ifdef __OpenBSD__ -#include -#include -#define NO_GETSPNAM -#define SIGNAL_CAST (void (*)()) -#define USE_DIRECT -#define REPLACE_INNETGR -#define HAVE_BZERO -#define HAVE_PATHCONF -#define HAVE_GETGRNAM 1 -#define HAVE_GETTIMEOFDAY -#define HAVE_MEMMOVE -#define USE_GETCWD -#define USE_SETSID -#endif +#include +#endif -#ifdef AIX -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef ALLOW_CHANGE_PASSWORD -#include -#endif /* ALLOW_CHANGE_PASSWORD */ -/* According to AIX 4.1 man pages, inet_ntoa needs the following headers */ -#include #include #include -#include -#include -#include -#define HAVE_GETGRNAM 1 -#define SYSV -#define USE_WAITPID -#define USE_SIGBLOCK -#define SIGNAL_CAST (void (*)()) -#define DEFAULT_PRINTING PRINT_AIX -/* we undef this because sys/param.h is broken in aix. uggh. */ -#undef MAXHOSTNAMELEN -#endif - - -#ifdef HPUX -#include -#include -#include -#include -#include -#include -#include -#include /* needed for inet_ntoa proto */ -#ifdef HPUX_10_TRUSTED -#include -#include -#define NEED_AUTH_PARAMETERS -#endif -#define SIGNAL_CAST (void (*)(__harg)) -#ifdef HPUX10 -#include -#else /* HPUX10 */ -/* This is only needed for HPUX 9.x */ -#define SELECT_CAST (int *) -#endif /* HPUX10 */ -#define SYSV -#define USE_WAITPID -#define WAIT3_CAST2 (int *) -#define USE_GETCWD -#define USE_SETSID -#define USE_SETRES -#define USE_SYSV_IPC -#define NO_SEMUN -#define DEFAULT_PRINTING PRINT_HPUX -/* Ken Weiss tells us that SIGCLD_IGNORE is - not good for HPUX */ -/* #define SIGCLD_IGNORE */ -#define USE_SIGPROCMASK /* Needed to stop zombie processes on HPUX 9.x and 10.x.*/ -#endif /* HPUX */ - - -#ifdef SEQUENT -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#define SIGNAL_CAST (void (*)(int)) -#define USE_WAITPID -#define USE_GETCWD -#define NO_EID -#define STATFS4 -#define USE_DIRECT -#ifdef PTX4 -#undef USE_DIRECT -#endif -#endif - - +#include +#include +#include -#ifdef SEQUENT_PTX4 -#include -#include -#include -#include -#include -#include -#include -#include +#ifdef HAVE_NETINET_TCP_H #include -#include -#include -#define SYSV -#define USE_WAITPID -#define SIGNAL_CAST (void (*)(int)) -#define USE_STATVFS -#define USE_GETCWD -#ifndef seteuid -#define seteuid(uid) setreuid(-1,uid) -#endif -#ifndef setegid -#define setegid(gid) setregid(-1,gid) -#endif #endif - -#ifdef NEXT2 -#include -#include -#include -#include -#define bzero(b,len) memset(b,0,len) -#define mode_t int -#define NO_UTIMBUF -#include -#define NOSTRDUP -#define USE_DIRECT -#define USE_WAITPID -#endif - - -#ifdef NEXT3_0 -#include -#include -#include -#define NO_UTIMBUF -#include -#define NOSTRDUP -#define USE_DIRECT -#define mode_t int -#define GID_TYPE int -#define gid_t int -#define pid_t int -#define SIGNAL_CAST (void (*)(int)) -#define WAIT3_CAST1 (union wait *) -#define HAVE_GMTOFF -#define O_NONBLOCK O_NDELAY -#endif - - - -#ifdef APOLLO -#include -#include -#include -#define NO_UTIMBUF -#define USE_DIRECT -#define USE_GETCWD -#define SIGNAL_CAST (void (*)()) -#define HAVE_FCNTL_LOCK 0 -#define HAVE_GETTIMEOFDAY -#define STATFS4 -#endif - - - -#ifdef SCO -#include -#include -#include -#include -#include +#ifdef HAVE_TERMIOS_H #include -#include -#include -#include -#include -#include -#ifdef EVEREST -#include -#endif /* EVEREST */ -#ifdef NETGROUP -#include -#endif /* NETGROUP */ -#ifdef SecureWare -#include -#include -#include -#define crypt bigcrypt -#endif /* SecureWare */ -#define SIGNAL_CAST (void (*)(int)) -#define USE_WAITPID -#define USE_GETCWD -#define USE_SETSID -#ifdef SCO3_2_2 -#define setuid(u) setreuid(u,-1) -#define seteuid(u) setreuid(-1,u) -#else /* SCO3_2_2 */ -#ifndef EVEREST -#define ftruncate(f,l) syscall(0x0a28,f,l) -#define USE_IFREQ -#define NO_INITGROUPS -#endif /* EVEREST */ -#endif /* SCO3_2_2 */ -#define STATFS4 -#define NO_FSYNC -#define HAVE_PATHCONF -#define NO_GETRLIMIT -#endif /* SCO */ - - - -/* Definitions for RiscIX */ -#ifdef RiscIX -#define SIGNAL_CAST (void (*)(int)) -#include -#include -#include -#include -#include -#include -#define HAVE_GETTIMEOFDAY -#define NOSTRCASECMP -#define NOSTRDUP #endif - - -#ifdef ISC -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#define FIONREAD FIORDCHK -#define SYSV -#define USE_WAITPID -#define SIGNAL_CAST (void (*)(int)) -#define USE_GETCWD -#define USE_SETSID -#define USE_IFREQ -#define NO_FTRUNCATE -#define STATFS4 -#define NO_FSYNC -#endif - - - -#ifdef AUX -#include -#include -#include -#include -#include -#include -#define SYSV -#define USE_WAITPID -#define SIGNAL_CAST (void (*)(int)) -char *strdup (char *); -#define USE_GETCWD +#if HAVE_DIRENT_H +# include +# define NAMLEN(dirent) strlen((dirent)->d_name) +#else +# define dirent direct +# define NAMLEN(dirent) (dirent)->d_namlen +# if HAVE_SYS_NDIR_H +# include +# endif +# if HAVE_SYS_DIR_H +# include +# endif +# if HAVE_NDIR_H +# include +# endif +#endif + +#ifdef HAVE_SHARED_MMAP +#include #endif - -#ifdef M88K_R3 -#include -#include -#include -#include -#define STATFS4 -#define SYSV -#define USE_WAITPID -#define SIGNAL_CAST (void (*)(int)) -char *strdup (char *); -#define USE_GETCWD -#define NO_FSYNC -#define NO_EID +#ifdef HAVE_SYSV_IPC +#include +#include +#include #endif - -#ifdef DNIX -#include -#include -#include -#include -#include -#define NO_GET_BROADCAST -#define USE_WAITPID -#define USE_GETCWD -#define USE_SETSID -#define STATFS4 -#define NO_EID -#define PF_INET AF_INET -#define NO_STRERROR -#define ftruncate(f,l) chsize(f,l) -#endif /* DNIX */ - -#ifdef CONVEX -#include -#include -#include -#include -#include -#include -#define DONT_REINSTALL_SIG -#define USE_SIGBLOCK -#define USE_WAITPID -#define SIGNAL_CAST (_SigFunc_Ptr_t) -#define NO_GETSPNAM -#define HAVE_MEMMOVE -extern char *mktemp(char *); -extern int fsync(int); -extern int seteuid(uid_t); -extern int setgroups(int, int *); -extern int initgroups(char *, int); -extern int statfs(char *, struct statfs *); -extern int setegid(gid_t); -extern int getopt(int, char *const *, const char *); -extern int chroot(char *); -extern int gettimeofday(struct timeval *, struct timezone *); -extern int gethostname(char *, int); -extern char *crypt(char *, char *); -extern char *getpass(char *); -#endif - - -#ifdef CRAY -#define MAXPATHLEN 1024 -#include -#include -#include -#include -#define SIGNAL_CAST (void (*)(int)) -#define SIGCLD_IGNORE -#define HAVE_FCNTL_LOCK 1 -#define USE_SETSID -#define STATFS4 +#ifdef HAVE_NET_IF_H +#include #endif -#ifdef ALTOS -#include -#include -#include -#include -#include -#define const -#define uid_t int -#define gid_t int -#define mode_t int -#define ptrdiff_t int -#define HAVE_GETGRNAM 0 -#define NO_EID -#define NO_FSYNC -#define NO_FTRUNCATE -#define NO_GETRLIMIT -#define NO_INITGROUPS -#define NO_SELECT -#define NO_SETGROUPS -#define NO_STRERROR -#define NO_STRFTIME -#define NO_TM_NAME -#define NO_UTIMEH -#define NOSTRCASECMP -#define REPLACE_MKTIME -#define REPLACE_RENAME -#define REPLACE_STRSTR -#define STATFS4 -#define USE_GETCWD -#endif - -#ifdef QNX -#include -#define STATFS4 -#include -/* Override QNX size of 32 to be 255 */ -#define FD_SETSIZE 255 -#include -#include -#include -#define SIGNAL_CAST (void (*)()) -#define USE_WAITPID -#define NO_INITGROUPS -#define NO_SETGROUPS -#define HAVE_TIMEZONE -#define USE_GETCWD -#define USE_SETSID -#define HAVE_FCNTL_LOCK 1 -#define DEFAULT_PRINTING PRINT_QNX +#ifdef HAVE_SYS_MOUNT_H +#include #endif - -#ifdef NEWS42 -#include -#include +#ifdef HAVE_SYS_VFS_H #include -#include -typedef int mode_t; -#endif - -#ifdef OS2 -#include -#include -#include -#include -#define SIGNAL_CAST (void (*)()) -#define HAVE_FCNTL_LOCK 0 -#define USE_WAITPID -#define NO_GET_BROADCAST -#define NO_EID -#define NO_SETGROUPS -#define NO_INITGROUPS -#define NO_CRYPT -#define NO_STATFS -#define NO_CHROOT -#define NO_CHOWN -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif - - -#ifdef LYNX -#define SIGNAL_CAST (void (*)()) -#define WAIT3_CAST1 (union wait *) -#define STATFS4 -#include -#include -#include -#include -#include -#include -#define USE_GETCWD -#define USE_GETSID -#endif - - -#ifdef BOS -#define SIGNAL_CAST (void (*)(int)) -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#ifdef AMIGA -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define SIGNAL_CAST (void (*)(int)) -#define USE_GETCWD -#define HAVE_BZERO -#define HAVE_MEMMOVE -#define USE_SIGPROCMASK -#define USE_WAITPID -#define USE_DIRECT -#define USE_F_FSIZE -#define HAVE_FCNTL_LOCK 0 -#define HAVE_GETTIMEOFDAY -#define HAVE_PATHCONF - -#define HAVE_NO_PROC -#define NO_FORK_DEBUG -#define HAVE_FORK 0 -#define HAVE_VFORK 1 -#endif - -/* For UnixWare 2.x's ia_uinfo routines. (tangent@cyberport.com) */ -#ifdef IA_UINFO -#include -#include -#endif - - -/******************************************************************* -end of the platform specific sections -********************************************************************/ - -#if (!defined(USE_LDAP_DB) && !defined(USE_NISPLUS_DB)) -#define USE_SMBPASS_DB -#endif - -#if defined(USE_MMAP) || defined(FAST_SHARE_MODES) -#include #endif -#ifdef SecureWare -#define NEED_AUTH_PARAMETERS +#ifdef HAVE_SYS_FS_S5PARAM_H +#include #endif -#ifdef REPLACE_GETPASS -extern char *getsmbpass(char *); -#define getpass(s) getsmbpass(s) +#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY) +#include #endif -#ifdef REPLACE_INNETGR -#define innetgr(group,host,user,dom) InNetGr(group,host,user,dom) +#ifdef HAVE_SYS_STATFS_H +# include #endif -#ifndef FD_SETSIZE -#define FD_SETSIZE 255 +#ifdef HAVE_DUSTAT_H +#include #endif -#ifndef __STDC__ -#define const -#endif - -/* Now for some other grungy stuff */ -#if defined(NO_GETSPNAM) && !defined(QNX) -struct spwd { /* fake shadow password structure */ - char *sp_pwdp; -}; -#endif - -#ifndef HAVE_BZERO -#ifndef bzero -#define bzero(p,s) memset(p,0,s) -#endif +#ifdef HAVE_SYS_STATVFS_H +#include #endif -#ifndef HAVE_MEMMOVE -#ifndef memmove -#define memmove(d,s,n) MemMove(d,s,n) -#endif +#ifdef HAVE_SHADOW_H +#include #endif -#ifdef USE_DIRECT -#include -#endif +#ifdef HAVE_SYS_SECURITY_H +#include +#include +#define PASSWORD_LENGTH 16 +#endif /* HAVE_SYS_SECURITY_H */ -/* some unixes have ENOTTY instead of TIOCNOTTY */ -#ifndef TIOCNOTTY -#ifdef ENOTTY -#define TIOCNOTTY ENOTTY -#endif +#ifdef HAVE_COMPAT_H +#include #endif -#ifndef SIGHUP -#define SIGHUP 1 +#ifndef uchar +#define uchar unsigned char #endif -/* if undefined then use bsd or sysv printing */ -#ifndef DEFAULT_PRINTING -#ifdef SYSV -#define DEFAULT_PRINTING PRINT_SYSV +#ifdef HAVE_UNSIGNED_CHAR +#define schar signed char #else -#define DEFAULT_PRINTING PRINT_BSD -#endif +#define schar char #endif -/* This defines the name of the printcap file. It is MOST UNLIKELY that - this will change BUT! Specifying a file with the format of a printcap - file but containing only a subset of the printers actually in your real - printcap file is a quick-n-dirty way to allow dynamic access to a subset - of available printers. -*/ -#ifndef PRINTCAP_NAME -#ifdef AIX -#define PRINTCAP_NAME "/etc/qconfig" -#elif defined(SYSV) -#define PRINTCAP_NAME "lpstat" -#else -#define PRINTCAP_NAME "/etc/printcap" +#ifndef int32 +#if (SIZEOF_INT == 4) +#define int32 int +#elif (SIZEOF_LONG == 4) +#define int32 long +#elif (SIZEOF_SHORT == 4) +#define int32 short #endif #endif - -#ifdef USE_SYSV_IPC -#include -#include -#include -#ifdef NO_SEMUN -union semun { - int val; - struct semid_ds *buf; - unsigned short *array; -}; -#endif -#if defined(HPUX) && defined(HPUX10) -#ifdef SEMMSL -#undef SEMMSL -#endif /* SEMMSL */ -#endif /* HPUX && HPUX10 */ -#endif - -#ifdef AFS_AUTH -#include -#include -#endif - -#ifdef DFS_AUTH -#include -#include +#ifndef uint32 +#define uint32 unsigned int32 #endif -#ifdef KRB5_AUTH -#include +#ifndef MIN +#define MIN(a,b) ((a)<(b)?(a):(b)) #endif -#ifdef KRB4_AUTH -#include +#ifndef MAX +#define MAX(a,b) ((a)>(b)?(a):(b)) #endif -#ifdef NO_UTIMBUF -struct utimbuf { - time_t actime; - time_t modtime; -}; -#endif - -#ifdef NO_STRERROR -#ifndef strerror +#ifndef HAVE_STRERROR extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] #endif -#endif -#ifndef perror -#define perror(m) printf("%s: %s\n",m,strerror(errno)) +#ifndef HAVE_STRCHR +# define strchr index +# define strrchr rindex #endif -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 255 +#ifndef HAVE_ERRNO_DECL +extern int errno; #endif + /* Lists, trees, caching, datbase... */ #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" @@ -1258,157 +311,144 @@ extern char *sys_errlist[]; /***** automatically generated prototypes *****/ #include "proto.h" +#ifdef strcpy +#undef strcpy +#endif /* strcpy */ +#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; +#ifdef strcat +#undef strcat +#endif /* strcat */ +#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; -#ifndef S_IFREG -#define S_IFREG 0100000 -#endif +#ifdef sprintf +#undef sprintf +#endif /* sprintf */ +#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; -#ifndef S_ISREG -#define S_ISREG(x) ((S_IFREG & (x))!=0) -#endif +#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) +#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) +#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) +#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) -#ifndef S_ISDIR -#define S_ISDIR(x) ((S_IFDIR & (x))!=0) +#ifdef __COMPAR_FN_T +#define QSORT_CAST (__compar_fn_t) #endif -#if !defined(S_ISLNK) && defined(S_IFLNK) -#define S_ISLNK(x) ((S_IFLNK & (x))!=0) +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) #endif -#ifdef UFC_CRYPT -#define crypt ufc_crypt +/* this guess needs to be improved (tridge) */ +#if defined(HAVE_STATVFS) && !defined(SYSV) +#define SYSV 1 #endif -#ifdef REPLACE_STRLEN -#define strlen(s) Strlen(s) +#ifndef DEFAULT_PRINTING +#ifdef SYSV +#define DEFAULT_PRINTING PRINT_SYSV +#else +#define DEFAULT_PRINTING PRINT_BSD #endif - -#ifdef REPLACE_STRSTR -#define strstr(s,p) Strstr(s,p) #endif -#ifdef REPLACE_MKTIME -#define mktime(t) Mktime(t) +#ifndef SIGCLD +#define SIGCLD SIGCHLD #endif -#ifndef NGROUPS_MAX -#define NGROUPS_MAX 128 +#if (defined(HAVE_SYSV_IPC) || defined(HAVE_SHARED_MMAP)) +#define FAST_SHARE_MODES 1 #endif -#ifndef EDQUOT -#define EDQUOT ENOSPC +#ifndef MAP_FILE +#define MAP_FILE 0 #endif -#ifndef HAVE_GETGRNAM -#define HAVE_GETGRNAM 1 +#ifdef HAVE_SYSV_IPC +#ifndef HAVE_UNION_SEMUN +union semun { + int val; + struct semid_ds *buf; + unsigned short *array; +}; #endif - -#ifndef SOL_TCP -#define SOL_TCP 6 #endif -/* default to using ftruncate workaround as this is safer than assuming -it works and getting lots of bug reports */ -#ifndef FTRUNCATE_CAN_EXTEND -#define FTRUNCATE_CAN_EXTEND 0 +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) +#define USE_SMBPASS_DB 1 #endif -/* maybe this unix doesn't separate RD and WR locks? */ -#ifndef F_RDLCK -#define F_RDLCK F_WRLCK +#if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS) +#define OSF1_ENH_SEC 1 #endif -#ifndef ENOTSOCK -#define ENOTSOCK EINVAL +#if defined(HAVE_PAM_AUTHENTICATE) && defined(HAVE_SECURITY_PAM_APPL_H) +#define HAVE_PAM 1 #endif -#ifndef SIGCLD -#define SIGCLD SIGCHLD -#endif +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) +#define HAVE_NETGROUP 1 +#endif -#ifndef MAP_FILE -#define MAP_FILE 0 +#ifndef ALLOW_CHANGE_PASSWORD +#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) +#define ALLOW_CHANGE_PASSWORD 1 +#endif #endif -#ifndef HAVE_FCNTL_LOCK -#define HAVE_FCNTL_LOCK 1 +/* what is the longest significant password available on your system? + Knowing this speeds up password searches a lot */ +#ifndef PASSWORD_LENGTH +#define PASSWORD_LENGTH 8 #endif -#ifndef WAIT3_CAST2 -#define WAIT3_CAST2 (struct rusage *) + +#ifndef HAVE_PIPE +#define SYNC_DNS 1 #endif -#ifndef WAIT3_CAST1 -#define WAIT3_CAST1 (int *) +#ifndef MAXPATHLEN +#define MAXPATHLEN 256 #endif -#ifndef QSORT_CAST -#define QSORT_CAST (int (*)()) +#ifndef SEEK_SET +#define SEEK_SET 0 #endif #ifndef INADDR_LOOPBACK #define INADDR_LOOPBACK 0x7f000001 -#endif /* INADDR_LOOPBACK */ - -/* this is a rough check to see if this machine has a lstat() call. - it is not guaranteed to work */ -#if !defined(S_ISLNK) -#define lstat stat #endif -/* Not all systems declare ERRNO in errno.h... and some systems #define it! */ -#ifndef errno -extern int errno; -#endif - - -#ifdef NO_EID -#define geteuid() getuid() -#define getegid() getgid() -#define seteuid(x) setuid(x) -#define setegid(x) setgid(x) +#ifndef HAVE_CRYPT +#define crypt ufc_crypt #endif +#if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) +#define ULTRIX_AUTH 1 +#endif -#if (HAVE_FCNTL_LOCK == 0) -/* since there is no locking available, system includes */ -/* for DomainOS 10.4 do not contain any of the following */ -/* #define's. So, to satisfy the compiler, add these */ -/* #define's, although they arn't really necessary. */ -#define F_GETLK 0 -#define F_SETLK 0 -#define F_WRLCK 0 -#define F_UNLCK 0 -#endif /* HAVE_FCNTL_LOCK == 0 */ - -#ifdef NOSTRCASECMP -#define strcasecmp(s1,s2) StrCaseCmp(s1,s2) -#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n) +#ifndef HAVE_STRDUP +char *strdup(const char *s); #endif -#ifdef strcpy -#undef strcpy -#endif /* strcpy */ -#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; +#ifndef HAVE_MEMMOVE +void *memmove(void *dest,const void *src,int size); +#endif -#ifdef strcat -#undef strcat -#endif /* strcat */ -#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; +#ifndef HAVE_INITGROUPS +int initgroups(char *name,gid_t id); +#endif -#ifdef sprintf -#undef sprintf -#endif /* sprintf */ -#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; +#ifndef HAVE_RENAME +int rename(const char *zfrom, const char *zto); +#endif -#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) -#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) -#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) -#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) +#ifndef HAVE_MKTIME +time_t mktime(struct tm *t); +#endif -#if MEM_MAN -#include "mem_man/mem_man.h" -#endif /* MEM_MAN */ +#ifndef HAVE_FTRUNCATE +int ftruncate(int f,long l); +#endif #endif /* _INCLUDES_H */ -- cgit From fb08c34cf3950f994701a9c98c89670f6346f7ab Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Jul 1998 05:05:36 +0000 Subject: get rid of the runtime test for broken getgroups() and add a compile time test instead. This also allows us to get rid of the igroups element of a couple of structures. (This used to be commit 8b25fe734166b76ceebf8d9543c706ebe0fddc96) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b63787fd5e..2a420f76ed 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -287,6 +287,12 @@ extern char *sys_errlist[]; extern int errno; #endif +#ifdef HAVE_BROKEN_GETGROUPS +#define GID_T int +#else +#define GID_T gid_t +#endif + /* Lists, trees, caching, datbase... */ #include "ubi_sLinkList.h" -- cgit From a957abd1fd1bd891354abb1a3590627ae06a45e9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Jul 1998 07:02:06 +0000 Subject: test for a broken inet_ntoa and replace it if necessary (for IRIX+gcc-2.8.1) (This used to be commit ddffbcbcb1284b6ead5f7f7b6665ba2456c0071a) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2a420f76ed..a4547a6b4a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -408,6 +408,9 @@ union semun { #define PASSWORD_LENGTH 8 #endif +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +#endif #ifndef HAVE_PIPE #define SYNC_DNS 1 -- cgit From 5a5b4258ed51cc3dabe7a017fa2e3a538ef99d7d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 13 Aug 1998 16:20:37 +0000 Subject: HAVE_STATVFS should be STAT_STAVFS (caused printing to break on IRIX). Jeremy. (This used to be commit 83c54b01ba6c891a0587a80aa083594ddda9a680) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a4547a6b4a..20eb850cd1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -346,7 +346,7 @@ extern int errno; #endif /* this guess needs to be improved (tridge) */ -#if defined(HAVE_STATVFS) && !defined(SYSV) +#if defined(STAT_STATVFS) && !defined(SYSV) #define SYSV 1 #endif -- cgit From 2bb8f8ce4385336083caf353e5ac11e11457e6f8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 14 Aug 1998 06:25:26 +0000 Subject: define INADDR_NONE if not already defined (This used to be commit 7446540017e29827900981cab5ae3a2f9f7b3ce6) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 20eb850cd1..a65114f3de 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -428,6 +428,10 @@ union semun { #define INADDR_LOOPBACK 0x7f000001 #endif +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + #ifndef HAVE_CRYPT #define crypt ufc_crypt #endif -- cgit From b9623ab59e813131b1ed3f51616a46e719d59c21 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 14 Aug 1998 17:38:29 +0000 Subject: this is the bug change to using connection_struct* instead of cnum. Connections[] is now a local array in server.c I might have broken something with this change. In particular the oplock code is suspect and some .dll files aren't being oplocked when I expected them to be. I'll look at it after I've got some sleep. (This used to be commit c7ee025ead4a85b6fa44a832047b878451845fb6) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a65114f3de..237251209a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -464,4 +464,10 @@ time_t mktime(struct tm *t); int ftruncate(int f,long l); #endif +#if (defined(HAVE_SETRESUID) && !defined(HAVE_SETRESUID_DECL)) +/* stupid glibc */ +int setresuid(uid_t ruid, uid_t euid, uid_t suid); +int setresgid(gid_t rgid, gid_t egid, gid_t sgid); +#endif + #endif /* _INCLUDES_H */ -- cgit From e13aeea928dd89373cfaf3916c96f853c1227884 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 15 Aug 1998 01:19:26 +0000 Subject: configure: Changes for extra headers. configure.in: Source for header changes. client/clitar.c: Fixed isXXX macros & debugs for gcc pedantic compile. include/config.h.in: Added MEMSET, BZERO, MEMORY, RPCSVC_YPCLNT, STRINGS headers. include/includes.h: Headers for the above. include/smb.h: Made SIGNAL_CAST POSIX by default void (*)(int). lib/access.c: Fixed isXXX macros & debugs for gcc pedantic compile. lib/charset.c: Fixed isXXX macros & debugs for gcc pedantic compile. lib/debug.c: Fixed signal functs. lib/kanji.c: Fixed isXXX macros & debugs for gcc pedantic compile. lib/smbrun.c: Fixed isXXX macros & debugs for gcc pedantic compile. lib/util.c: Fixed isXXX macros & debugs for gcc pedantic compile. libsmb/namequery.c: Fixed isXXX macros & debugs for gcc pedantic compile. locking/shmem.c: Fixed isXXX macros & debugs for gcc pedantic compile. locking/shmem_sysv.c: Fixed error messages in sysV stuff. nmbd/asyncdns.c: Fixed signal functs. nmbd/nmbd.c: Fixed isXXX macros & debugs for gcc pedantic compile. passdb/passdb.c: Fixed isXXX macros & debugs for gcc pedantic compile. passdb/smbpassfile.c: Fixed isXXX macros & debugs for gcc pedantic compile. smbd/chgpasswd.c: Fixed isXXX macros & debugs for gcc pedantic compile. smbd/ipc.c: Fixed isXXX macros & debugs for gcc pedantic compile. smbd/nttrans.c: Fixed fsp code path. smbd/password.c: fixed HAVE_YP_GET_DEFAULT_DOMAIN problem. smbd/printing.c: Fixed isXXX macros & debugs for gcc pedantic compile. smbd/reply.c: Fixed isXXX macros & debugs for gcc pedantic compile. smbd/server.c: Fixed isXXX macros & debugs for gcc pedantic compile. smbd/trans2.c: Fixed core dump bug. smbd/uid.c: Fixed isXXX macros & debugs for gcc pedantic compile. Jeremy. (This used to be commit 1b9cbcd02e575dc0a95fa589f720df30a4acc46b) --- source3/include/includes.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 237251209a..42ec579692 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -71,6 +71,14 @@ #include #endif +#ifdef HAVE_STRINGS_H +#include +#endif + +#ifdef HAVE_MEMORY_H +#include +#endif + #ifdef HAVE_MALLOC_H #include #endif @@ -241,6 +249,10 @@ #include #endif +#ifdef HAVE_RPCSVC_YPCLNT_H +#include +#endif + #ifndef uchar #define uchar unsigned char #endif @@ -470,4 +482,8 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid); int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif +#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) +#define bzero(a,b) memset((a),'\0',(b)) +#endif + #endif /* _INCLUDES_H */ -- cgit From 23294e6fc1a6270067b7745ccaea1117a706e361 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 16 Aug 1998 05:22:01 +0000 Subject: added include of sys/resource.h (This used to be commit bf136b4fa8aeadcea8f65610148d46d093aba2cc) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 42ec579692..4ced157359 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -49,9 +49,14 @@ #include +#ifdef HAVE_SYS_RESOURCE_H +#include +#endif + #ifdef HAVE_UNISTD_H #include #endif + #include #include -- cgit From 72ed7049d88e5296ebec362189e62a384385ad34 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 17 Aug 1998 06:47:53 +0000 Subject: added some optimisation for the case where the number of open files is very large. files.c now promotes a files_struct to the top of the list if it is used when it is more than 10 elements from the top. also moved common linked list code for the 5 sets of linked lists that I've created over the past few days into dlinklist.h (I've explained to Chris why I didn't use the ubiqx code) (This used to be commit 1eb9ae2996b5a243a147f485e7e353d54f820852) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4ced157359..3fd5f7be08 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -314,6 +314,8 @@ extern int errno; /* Lists, trees, caching, datbase... */ #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" +#include "dlinklist.h" + #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ -- cgit From 12de4034c72ea5054d716bf848c2b16bef7a4d89 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 19 Aug 1998 01:49:34 +0000 Subject: Makefile.in: Moved blocking lock code into smbd/blocking.c for link purposes. include/includes.h: Added nterr.h. locking/locking.c: Moved blocking lock code into smbd/blocking.c for link purposes. smbd/close.c: Added blocking lock removal to file close. smbd/filename.c: Tidied up unix_convert() so I could read it (:-) in preparation for the stat_cache code. smbd/nttrans.c: Added WRITE_ATTRIBUTES check. smbd/reply.c: Fixed multibyte char problem in wildcard mask. Jeremy. (This used to be commit 148eaba3dadb1d0bd3ac3ef53da3d9811636e89a) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3fd5f7be08..a2419bc42c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -329,6 +329,8 @@ extern int errno; #include "kanji.h" #include "charset.h" +#include "nterr.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From 0e877bd53bcffcaeab738610ca64c685c99f8263 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 24 Aug 1998 18:53:37 +0000 Subject: resource.h on FreeBSD 2.1 requires sys/time.h to come first. (This used to be commit e94ab03a4f97ff7ee7bb938245cf054a00f950fd) --- source3/include/includes.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a2419bc42c..5d050bf627 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -49,6 +49,17 @@ #include +#ifdef TIME_WITH_SYS_TIME +#include +#include +#else +#ifdef HAVE_SYS_TIME_H +#include +#else +#include +#endif +#endif + #ifdef HAVE_SYS_RESOURCE_H #include #endif @@ -88,17 +99,6 @@ #include #endif -#ifdef TIME_WITH_SYS_TIME -#include -#include -#else -#ifdef HAVE_SYS_TIME_H -#include -#else -#include -#endif -#endif - #ifdef HAVE_FCNTL_H #include #else -- cgit From 3131d67cfd50ffeb2fa1cf0af948a4bb9ba6d39f Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Tue, 25 Aug 1998 13:17:04 +0000 Subject: added loads of pointless rpcsvc/ and rpc/ include files, all because rpcsvc/ypclnt.h wants a struct dom_binding. knock-on include effect under freebsd 2.1. (This used to be commit d1005b5692e41660a2a7230231b0591aa0773485) --- source3/include/includes.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5d050bf627..4993a29e2b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -254,6 +254,26 @@ #include #endif +#ifdef HAVE_RPC_TYPES_H +#include +#endif + +#ifdef HAVE_RPC_XDR_H +#include +#endif + +#ifdef HAVE_RPC_AUTH_H +#include +#endif + +#ifdef HAVE_RPC_CLNT_H +#include +#endif + +#ifdef HAVE_RPCSVC_YP_PROT_H +#include +#endif + #ifdef HAVE_RPCSVC_YPCLNT_H #include #endif -- cgit From 54499a925c9e580bbdeca12dde42af3557a01067 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 26 Aug 1998 02:02:55 +0000 Subject: took all the rpc includes back out until we can work out _why_ freebsd needs them and what should really be there. (This used to be commit c2bf18fb8d2fea5af86ba8cf5d92b1dc076dd7d5) --- source3/include/includes.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4993a29e2b..55c2c1a1de 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -254,30 +254,6 @@ #include #endif -#ifdef HAVE_RPC_TYPES_H -#include -#endif - -#ifdef HAVE_RPC_XDR_H -#include -#endif - -#ifdef HAVE_RPC_AUTH_H -#include -#endif - -#ifdef HAVE_RPC_CLNT_H -#include -#endif - -#ifdef HAVE_RPCSVC_YP_PROT_H -#include -#endif - -#ifdef HAVE_RPCSVC_YPCLNT_H -#include -#endif - #ifndef uchar #define uchar unsigned char #endif -- cgit From f1451f5d2e97360a39fdee1b26e140de5619673f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 26 Aug 1998 02:36:27 +0000 Subject: get includes right for systems that use getpwanam() (This used to be commit afe98165a261a740cd0ee88bf041d69721ec72e6) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 55c2c1a1de..38f0719164 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -244,6 +244,12 @@ #include #endif +#ifdef HAVE_GETPWANAM +#include +#include +#include +#endif + #ifdef HAVE_SYS_SECURITY_H #include #include -- cgit From 5e5e320d361afcb4d9503354b3912b4c7a672197 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 27 Aug 1998 20:38:53 +0000 Subject: This is the stat cache code - seems to work fine (needs heavy NetBench testing though.... :-). Attempts to efficiently reduce the number of stat() calls Samba does. Jeremy. (This used to be commit d0e48a2d8072c3e77a57ac6a2fb5044c05f03b41) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 38f0719164..4efa475424 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -419,6 +419,10 @@ union semun { #define HAVE_NETGROUP 1 #endif +#if defined (HAVE_NETGROUP) && defined(HAVE_RPCSVC_YPCLNT_H) +#include "rpcsvc/ypclnt.h" +#endif + #ifndef ALLOW_CHANGE_PASSWORD #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) #define ALLOW_CHANGE_PASSWORD 1 -- cgit From 693480af8bb2d3e83566af9463ca427f47a879da Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 31 Aug 1998 20:20:54 +0000 Subject: configure.in, configure: include/config.h.in: Added stropts and poll. include/smb.h: Moved old typedefs of uint8 etc. into include/includes.h where all the other defines live (changed them from typedefs to defines). Other changes : changed from using uint32 to SMB_DEV_T and SMB_INO_T in preparation for moving to size independed (ie. 64 bit clean) device and inode access. Stat call wrapper comes next :-). Jeremy. (This used to be commit 3d9ec96de5e04e83abafe9c5d980bd39eee856ea) --- source3/include/includes.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4efa475424..8b7620e4f9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -260,6 +260,14 @@ #include #endif +#ifdef HAVE_STROPTS_H +#include +#endif + +#ifdef HAVE_POLL_H +#include +#endif + #ifndef uchar #define uchar unsigned char #endif @@ -270,6 +278,31 @@ #define schar char #endif +/* + Samba needs type definitions for int16, int32, uint16 and uint32. + + Normally these are signed and unsigned 16 and 32 bit integers, but + they actually only need to be at least 16 and 32 bits + respectively. Thus if your word size is 8 bytes just defining them + as signed and unsigned int will work. +*/ + +#ifndef uint8 +#define uint8 unsigned char +#endif + +#ifndef int16 +#if (SIZEOF_SHORT == 4) +#define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; +#else /* SIZEOF_SHORT != 4 */ +#define int16 short +#endif /* SIZEOF_SHORT != 4 */ +#endif + +#ifndef uint16 +#define uint16 unsigned int16 +#endif + #ifndef int32 #if (SIZEOF_INT == 4) #define int32 int @@ -284,6 +317,18 @@ #define uint32 unsigned int32 #endif +/* + * Type for device and inodes. + */ + +#ifndef SMB_DEV_T +#define SMB_DEV_T uint32 +#endif + +#ifndef SMB_INO_T +#define SMB_INO_T uint32 +#endif + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -- cgit From 18556274139cc5a00593471bd745354d98a35303 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 1 Sep 1998 20:11:54 +0000 Subject: More abstraction of file system data types, to move to a 64 bit file interface for the NT SMB's. Created a new define, SMB_STRUCT_STAT that currently is defined to be struct stat - this wil change to a user defined type containing 64 bit info when the correct wrappers are written for 64 bit stat(), fstat() and lstat() calls. Also changed all sys_xxxx() calls that were previously just wrappers to the same call prefixed by a dos_to_unix() call into dos_xxxx() calls. This makes it explicit when a pathname translation is being done, and when it is not. Now, all sys_xxx() calls are meant to be wrappers to mask OS differences, and not silently converting filenames on the fly. Jeremy. (This used to be commit 28aa182dbffaa4ffd86047e608400de4b26e80eb) --- source3/include/includes.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b7620e4f9..15112cb163 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -329,6 +329,17 @@ #define SMB_INO_T uint32 #endif +/* + * Type for stat structure. This will + * soon change to a user defined type + * once we wrap stat(), fstat() and lstat() + * for 64 bit file sizes. JRA. + */ + +#ifndef SMB_STRUCT_STAT +#define SMB_STRUCT_STAT struct stat +#endif + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -- cgit From 7bb86c1b132bce31a006ea9768a54db7a45fe1a5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 3 Sep 1998 18:40:31 +0000 Subject: Ok - this is the 64 bit widening check in. It changes the configure to check for stat64 and friends, and then changes much of Samba to use the data type SMB_OFF_T for file size information. stat/fstat/lstat/lseek/ftruncate have now become sys_stat etc. to hide the 64 bit calls if needed. Note that this still does not expose 64 bit functionality to the client, as the changes to the reply_xxx smb's are not yet done. This code change should make these changes possible. Still to do before full 64 bit-ness to the client: fcntl lock code. statfs code widening of dev_t and ino_t (now possible due to SMB_DEV_T and SMB_OFF_T types being in place). Let me know if wierd things happen after this check-in and I'll fix them :-). Jeremy. (This used to be commit 14500936c321d15995c963766aac67bf1f4e3824) --- source3/include/includes.h | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 15112cb163..41fccce5fe 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -318,7 +318,7 @@ #endif /* - * Type for device and inodes. + * Types for devices, inodes and offsets. */ #ifndef SMB_DEV_T @@ -329,16 +329,36 @@ #define SMB_INO_T uint32 #endif +#ifndef SMB_OFF_T +#ifdef HAVE_OFF64_T +#define SMB_OFF_T off64_t +#else +#define SMB_OFF_T off_t +#endif +#endif + +/* + * Set the define that tells us if we can do 64 bit + * NT SMB calls. + */ + +#ifndef LARGE_SMB_OFF_T +#if defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) +#define LARGE_SMB_OFF_T 1 +#endif +#endif + /* - * Type for stat structure. This will - * soon change to a user defined type - * once we wrap stat(), fstat() and lstat() - * for 64 bit file sizes. JRA. + * Type for stat structure. */ #ifndef SMB_STRUCT_STAT +#if defined(HAVE_STAT64) && defined(HAVE_OFF64_T) +#define SMB_STRUCT_STAT struct stat64 +#else #define SMB_STRUCT_STAT struct stat #endif +#endif #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) -- cgit From 623a18db4b0f46c80c29e93a0ad0a2fcbfec71dc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 4 Sep 1998 00:23:28 +0000 Subject: More 64 bit stuff - now the fcntl locks are 64 bit clean. Nearly at the stage where I can expose the 64-bit-ness to the NT clients.... Jeremy. (This used to be commit 422f1dd45074c0e28203aca5952e57bbe56676b6) --- source3/include/includes.h | 60 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 12 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 41fccce5fe..4086bd53fe 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -330,11 +330,11 @@ #endif #ifndef SMB_OFF_T -#ifdef HAVE_OFF64_T -#define SMB_OFF_T off64_t -#else -#define SMB_OFF_T off_t -#endif +# ifdef HAVE_OFF64_T +# define SMB_OFF_T off64_t +# else +# define SMB_OFF_T off_t +# endif #endif /* @@ -343,9 +343,9 @@ */ #ifndef LARGE_SMB_OFF_T -#if defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) -#define LARGE_SMB_OFF_T 1 -#endif +# if defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) +# define LARGE_SMB_OFF_T 1 +# endif #endif /* @@ -353,11 +353,47 @@ */ #ifndef SMB_STRUCT_STAT -#if defined(HAVE_STAT64) && defined(HAVE_OFF64_T) -#define SMB_STRUCT_STAT struct stat64 -#else -#define SMB_STRUCT_STAT struct stat +# if defined(HAVE_STAT64) && defined(HAVE_OFF64_T) +# define SMB_STRUCT_STAT struct stat64 +# else +# define SMB_STRUCT_STAT struct stat +# endif +#endif + +/* + * Defines for 64 bit fcntl locks. + */ + +#ifndef SMB_STRUCT_FLOCK +# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# define SMB_STRUCT_FLOCK struct flock64 +# else +# define SMB_STRUCT_FLOCK struct flock +# endif +#endif + +#ifndef SMB_F_SETLKW +# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# define SMB_F_SETLKW F_SETLKW64 +# else +# define SMB_F_SETLKW F_SETLKW +# endif #endif + +#ifndef SMB_F_SETLK +# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# define SMB_F_SETLK F_SETLK64 +# else +# define SMB_F_SETLK F_SETLK +# endif +#endif + +#ifndef SMB_F_GETLK +# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# define SMB_F_GETLK F_GETLK64 +# else +# define SMB_F_GETLK F_GETLK +# endif #endif #ifndef MIN -- cgit From 83900f2b682c62f2b5620b29ecb710274990ac51 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 4 Sep 1998 20:53:58 +0000 Subject: Modified dev_t and ino_t code to be 64 bit clean (including changes to oplock break message passing). I think that smbd/nmbd are now inode and offset size independent (at least for 32 bit and 64 bit systems). Now to expose all this new functionality to NT clients..... Jeremy. (This used to be commit 5910d07bbf45a34d3c901461f74704c029a79474) --- source3/include/includes.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4086bd53fe..f0271906a5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -322,11 +322,25 @@ */ #ifndef SMB_DEV_T -#define SMB_DEV_T uint32 +#define SMB_DEV_T dev_t #endif +/* + * Setup the correctly sized inode type. + */ + #ifndef SMB_INO_T -#define SMB_INO_T uint32 +# ifdef HAVE_INO64_T +# define SMB_INO_T ino64_t +# else +# define SMB_INO_T ino_t +# endif +#endif + +#ifndef LARGE_SMB_INO_T +# if defined(HAVE_INO64_T) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8)) +# define LARGE_SMB_INO_T 1 +# endif #endif #ifndef SMB_OFF_T -- cgit From ac9b687cc2496409e1c8d86393812faf94ec7550 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 17 Sep 1998 19:16:12 +0000 Subject: configure configure.in: Added tests for fseek64 and ftell64. config.h.in: Added fseek64 and ftell64. includes.h: Added definition of SMB_BIG_INTEGER. smb.h: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. access.c: Tidyup of dbug statement. system.c: Added sys_fseek and sys_ftell. Changed mode calls to use mode_t. asyncdns.c: Tidyup of comment. loadparm.c: Tidyup of set_default_server_announce_type() function definition. ldap.c: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. nispass.c: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. smbpass.c: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. smbpassfile.c: Use sys_fseek(). chgpasswd.c: Tidyup of debug statement. dosmode.c: Changed mode calls to use mode_t. ipc.c: Removal of dead code. nttrans.c: Changed mode calls to use mode_t. open.c: Changed mode calls to use mode_t. pipes.c: Removal of dead code. reply.c: Removal of dead code. trans2.c: Removal of dead code. Changed mode calls to use mode_t. Jeremy. (This used to be commit c381d32e3dc23fe887408016cae821aceb30da2c) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f0271906a5..d8da84bd4e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -410,6 +410,12 @@ # endif #endif +#if defined(HAVE_LONGLONG) +#define SMB_BIG_INTEGER unsigned long long +#else +#define SMB_BIG_INTEGER unsigned long +#endif + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -- cgit From b8b67f4fab4a6fd686c5796c2701882197a7bd9d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 17 Sep 1998 23:06:57 +0000 Subject: configure configure.in: Added checks for statvfs64. Last bit of 64 bit widening (I hope :-). include/config.h.in: Added #undef STAT_STATVFS64. include/includes.h: Added SMB_STRUCT_STATVFS type, Changed SMB_BIG_INTEGER to SMB_BIG_UINT and SMB_BIG_INT types. include/smb.h: Added flag defines from CIFS spec. lib/debug.c: Fixed one more mode_t issue. lib/system.c: Added sys_statvfs wrapper. lib/util.c: Changed trim_string to use size_t. param/loadparm.c: Moved "blocking locks" into locking section. Alphabetised locking options. Question - shuld we do this for all options ? passdb/ldap.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. passdb/nispass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. passdb/smbpass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. smbd/dfree.c: Changed to use 64 bit types if available. Moved to use unsigned types. smbd/dosmode.c: Fixed one more mode_t issue. smbd/negprot.c: Changed literals to be FLAG_ #defines. smbd/nttrans.c: Removed dead code. smbd/open.c: Changed disk_free call. smbd/process.c: Changed literals to be FLAG_ #defines. smbd/reply.c: Changed disk_free call. smbd/trans2.c: Fixed but in SMB_QUERY_FS_VOLUME_INFO call. Was using UNICODE - should use ascii. tests/summary.c: Added STAT_STATVFS64 check. Jeremy. (This used to be commit c512b1b91fb7f2a7a93b9033a33e06d966daadb4) --- source3/include/includes.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d8da84bd4e..788e4485ab 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -374,6 +374,18 @@ # endif #endif +/* + * Type for statvfs structure. + */ + +#ifndef SMB_STRUCT_STATVFS +# if defined(STAT_STATVFS64) +# define SMB_STRUCT_STATVFS struct statvfs64 +# else +# define SMB_STRUCT_STATVFS struct statvfs +# endif +#endif + /* * Defines for 64 bit fcntl locks. */ @@ -411,9 +423,11 @@ #endif #if defined(HAVE_LONGLONG) -#define SMB_BIG_INTEGER unsigned long long +#define SMB_BIG_UINT unsigned long long +#define SMB_BIG_INT long long #else -#define SMB_BIG_INTEGER unsigned long +#define SMB_BIG_UINT unsigned long +#define SMB_BIG_INT long #endif #ifndef MIN -- cgit From 6dfbe2fa1a1d6eb5de05c8f5516c891abe7bdb74 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 18 Sep 1998 00:30:28 +0000 Subject: include/includes.h: lib/system.c: Can't assume every system has a statvfs varient. Return -1 for those that don't. smbd/reply.c: Fixed printf warning. Jeremy. (This used to be commit 14c134e8316687aa5a4ee089c2acfa6428faceae) --- source3/include/includes.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 788e4485ab..69b629f07c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -376,13 +376,18 @@ /* * Type for statvfs structure. + * Unfortunately, due to the make proto structure + * we still need to define this as void * for platforms + * that don't have either statvfs or statvfs64. JRA. */ #ifndef SMB_STRUCT_STATVFS # if defined(STAT_STATVFS64) # define SMB_STRUCT_STATVFS struct statvfs64 -# else +# elif defined(STAT_STATVFS) # define SMB_STRUCT_STATVFS struct statvfs +# else +# define SMB_STRUCT_STATVFS void * # endif #endif -- cgit From fdc07d1417274d10038da83cee2ea718e6a7abec Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Sep 1998 02:30:03 +0000 Subject: added a SMB_OFF_T_BITS define, allowing us to get rid of most of the #ifdefs for LARGE_OFF_T. (This used to be commit 724b9508c2d15bafdad5912fce702108fdd4cac3) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 69b629f07c..0f0bbdd89b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -351,6 +351,8 @@ # endif #endif +#define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8) + /* * Set the define that tells us if we can do 64 bit * NT SMB calls. -- cgit From c7da9992cb39fc84a6a915dd2158beaf5e616617 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Sep 1998 03:00:20 +0000 Subject: gto ri of a bunch more #ifdef LARGE_SMB_OFF_T checks by introducing a SOFF_T() macro for setting an SMB_OFF_T variable also limited mmap based reads to MAX_MMAP_SIZE. We really can't mmap 2^50 bytes due to virtual address space problems. (This used to be commit 4e784b18899eddd2399a51fa7d8c219560432922) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0f0bbdd89b..9b6e6266dc 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -353,6 +353,14 @@ #define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8) + +#ifdef LARGE_SMB_OFF_T +#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#else +#define SOFF_T(p, ofs, v) SIVAL(p,ofs,v) +#endif + + /* * Set the define that tells us if we can do 64 bit * NT SMB calls. -- cgit From d1a82e643b2e75db8e0c5afa7280ca383917ba64 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Sep 1998 03:53:14 +0000 Subject: got rid of SMB_STRUCT_STATVFS. I don't think we should be defining structures that only apply on some platforms. (This used to be commit 926591067cd8646426ca06df0b00a1d6f6dd5752) --- source3/include/includes.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9b6e6266dc..62c044603d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -384,23 +384,6 @@ # endif #endif -/* - * Type for statvfs structure. - * Unfortunately, due to the make proto structure - * we still need to define this as void * for platforms - * that don't have either statvfs or statvfs64. JRA. - */ - -#ifndef SMB_STRUCT_STATVFS -# if defined(STAT_STATVFS64) -# define SMB_STRUCT_STATVFS struct statvfs64 -# elif defined(STAT_STATVFS) -# define SMB_STRUCT_STATVFS struct statvfs -# else -# define SMB_STRUCT_STATVFS void * -# endif -#endif - /* * Defines for 64 bit fcntl locks. */ -- cgit From c198d4c8be6b1a4f042151714107ff37fc446471 Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Fri, 18 Sep 1998 12:47:46 +0000 Subject: Adding rewritten restore code ... Old code is still there surrounded by a OLD_DOTARPUT. (This used to be commit 00ba54d4ee9ad875c5cfbee09d4b745df5f116ab) --- source3/include/includes.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 62c044603d..8c8ee32301 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -611,6 +611,31 @@ union semun { #define ULTRIX_AUTH 1 #endif +/* This is the naughty bit. Autoconf should declare these symbols if + it finds that GNU Readline is installed. */ + +#define HAVE_LIBREADLINE +#define HAVE_READLINE_READLINE_H +#define HAVE_READLINE_HISTORY_H + +#ifdef HAVE_LIBREADLINE +# ifdef HAVE_READLINE_READLINE_H +# include +# ifdef HAVE_READLINE_HISTORY_H +# include +# endif +# else +# ifdef HAVE_READLINE_H +# include +# ifdef HAVE_HISTORY_H +# include +# endif +# else +# undef HAVE_LIBREADLINE +# endif +# endif +#endif + #ifndef HAVE_STRDUP char *strdup(const char *s); #endif -- cgit From 184db9266efcbcea13169f99002b32208dc2ec9b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 18 Sep 1998 17:50:18 +0000 Subject: configure configure.in include/config.h.in include/includes.h Fixed bugs in readline autoconf. param/loadparm.c smbd/open.c smbd/oplock.c: Started on kernel oplock code - checking forced by above issue. Should not be used currently. Jeremy. (This used to be commit f939efac9e6c45331b17e3d3aa6bc2235e886c1a) --- source3/include/includes.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8c8ee32301..86887cec6d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -357,7 +357,7 @@ #ifdef LARGE_SMB_OFF_T #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) #else -#define SOFF_T(p, ofs, v) SIVAL(p,ofs,v) +#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) #endif @@ -611,13 +611,6 @@ union semun { #define ULTRIX_AUTH 1 #endif -/* This is the naughty bit. Autoconf should declare these symbols if - it finds that GNU Readline is installed. */ - -#define HAVE_LIBREADLINE -#define HAVE_READLINE_READLINE_H -#define HAVE_READLINE_HISTORY_H - #ifdef HAVE_LIBREADLINE # ifdef HAVE_READLINE_READLINE_H # include -- cgit From 0ebdf28c9843dc7830a483980432a67955114db2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 18 Sep 1998 18:30:42 +0000 Subject: Fixed position of LARGE_SMB_OFF_T definition. The SOFF_T define was being done *before* the LARGE_SMB_OFF_T was being defined, but SOFF_T depended on it :-). This broke 64 bit file reporting. Jeremy. (This used to be commit c6a353cfabd99be0ce5bf508d716216443a44c20) --- source3/include/includes.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 86887cec6d..3f99574c64 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -353,14 +353,6 @@ #define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8) - -#ifdef LARGE_SMB_OFF_T -#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) -#else -#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) -#endif - - /* * Set the define that tells us if we can do 64 bit * NT SMB calls. @@ -372,6 +364,12 @@ # endif #endif +#ifdef LARGE_SMB_OFF_T +#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#else +#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#endif + /* * Type for stat structure. */ -- cgit From ac39ce3eba28eed97942e915f7b4cd77cdfd9e2d Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 21 Sep 1998 11:34:44 +0000 Subject: replace getpass() with getsmbpass() if getsmbpass.c compiles (This used to be commit 9a5bdf5c1bef689fe0d6879949df869efbc34783) --- source3/include/includes.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3f99574c64..5b47e6fa35 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -21,7 +21,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef NO_CONFIG_H /* for some tests */ #include "config.h" +#endif #include "local.h" #ifdef AIX @@ -37,15 +39,10 @@ #endif #ifdef SUNOS4 -#define REPLACE_GETPASS /* on SUNOS4 termios.h conflicts with sys/ioctl.h */ #undef HAVE_TERMIOS_H #endif -#ifdef SUNOS5 -#define REPLACE_GETPASS -#endif - #include @@ -661,4 +658,8 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define bzero(a,b) memset((a),'\0',(b)) #endif +#ifdef REPLACE_GETPASS +#define getpass(prompt) getsmbpass((prompt)) +#endif + #endif /* _INCLUDES_H */ -- cgit From 5f7ee360567a6b4e1a6f43ff01da057d2998fef8 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 25 Sep 1998 23:40:49 +0000 Subject: Makefile.in: Fixed bug with continuation line causing proto to fail. Added $(PROGS) $(SPROGS) as targets for make clean. acconfig.h: Added HAVE_IRIX_SPECIFIC_CAPABILITIES. configure.in: Added sys/capability.h header check. Added function checks for srandom random srand rand. Added HAVE_IRIX_SPECIFIC_CAPABILITIES test. includes.h: Added #include . ntdomain.h: Moved struct acct_info into here from smb.h smb.h: Added KERNEL_OPLOCK_CAPABILITY define. Moved enum action_type into rpcclient.h Moved struct cli_state into client.h Moved struct nt_client_info, struct tar_client_info, struct client_info into rpcclient.h lib/genrand.c: Changed to use sys_random() & friends. lib/smbrun.c: Lose capabilities after fork. lib/system.c: Added set_process_capability(), set_inherited_process_capability() sys_random(), sys_srandom(). lib/util.c: Added Ander's EFBIG lock check to fcntl_lock for 64 bit access to an 32 bit mounted NFS filesystem. nmbd/nmbd.c: Changed to use sys_random() & friends. nmbd/nmbd_browsesync.c: Changed to use sys_random() & friends. passdb/ldap.c: Missed one pdb_encode_acct_ctrl call. passdb/passdb.c: Changed to Ander's code for ' ' characters. passdb/smbpass.c: Added Ander's code to reset ACB_PWNOTREQ. script/mkproto.awk: Added 'long' to prototypes. smbd/chgpasswd.c: Lose capabilities after fork. smbd/open.c: Do the mmap *after* the kernel oplock. smbd/oplock.c: Removed stub code from kernel oplock path. Added set_process_capability(), set_inherited_process_capability() calls. smbd/reply.c: Initialize count = 0, offset = 0. smbd/server.c: Added set_process_capability(), set_inherited_process_capability() calls. tests/summary.c: Ensure we have RANDOM or RAND. utils/smbpasswd.c: Added Ander's code to reset ACB_PWNOTREQ. utils/torture.c: Changed to use sys_random() & friends. Jeremy. (This used to be commit e8be306f23963ac00b1a383ebe0cc1421529fb02) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b47e6fa35..2ec134b7c6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -265,6 +265,10 @@ #include #endif +#ifdef HAVE_SYS_CAPABILITY_H +#include +#endif + #ifndef uchar #define uchar unsigned char #endif -- cgit From 959005eb5e78f847c0c4f789c3af96549617873c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 3 Oct 1998 11:51:30 +0000 Subject: define O_ACCMODE if not defined (This used to be commit 48de03824ed33e9751bc9deeb22f1e1ef650b8cb) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2ec134b7c6..ecd7e0e1ab 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -606,6 +606,10 @@ union semun { #define crypt ufc_crypt #endif +#ifndef O_ACCMODE +#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) +#endif + #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) #define ULTRIX_AUTH 1 #endif -- cgit From 57a58f592b67a0ebf482f06315b9c546590126bf Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 4 Oct 1998 04:33:56 +0000 Subject: more smbw cleanups. - cleaned up prototyping. Unfortunately we can't auto-prototype wrapped.c because it replaces system functions. - split stat functions into smbw_stat.c (This used to be commit 04e92e692e49234df6fbbfd07a33b315ed62f0de) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ecd7e0e1ab..be41db4d43 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -467,6 +467,7 @@ extern int errno; #include "version.h" #include "smb.h" +#include "smbw.h" #include "nameserv.h" #include "byteorder.h" -- cgit From d836bedb4035acc61e83f1a0dc76df2c33dfc8af Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 7 Oct 1998 07:55:14 +0000 Subject: more OSF1 changes as well as changes to allow us to use the standard includes.h in wrapped.c, thus making porting much simpler (This used to be commit 6f2239c935fdecfefa89227c113df01e3957691a) --- source3/include/includes.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index be41db4d43..c9a5e8b271 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -24,6 +24,20 @@ #ifndef NO_CONFIG_H /* for some tests */ #include "config.h" #endif + +#ifdef NO_PROTO +/* get rid of prototypes for smbwrapper */ +#define _NO_PROTO + +#ifdef HAVE_SYS_CDEFS_H +#include +#ifdef __P +#undef __P +#define __P(x) () +#endif +#endif +#endif + #include "local.h" #ifdef AIX @@ -80,6 +94,12 @@ #include #endif +#ifdef HAVE_SYS_SYSCALL_H +#include +#elif HAVE_SYSCALL_H +#include +#endif + #ifdef HAVE_STRING_H #include #endif @@ -671,4 +691,7 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define getpass(prompt) getsmbpass((prompt)) #endif +/* yuck, I'd like a better way of doing this */ +#define DIRP_SIZE (256 + 32) + #endif /* _INCLUDES_H */ -- cgit From 829e72fe9c97feaa3d45b768984a4c47b906a23a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 7 Oct 1998 09:57:22 +0000 Subject: yet another attempt at making this stuff portable. This time I use minimal includes in wrapped.c (This used to be commit fd6a59d8ca0932d61a60b74485841001d4f8fd44) --- source3/include/includes.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c9a5e8b271..2c4c09f675 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -25,19 +25,6 @@ #include "config.h" #endif -#ifdef NO_PROTO -/* get rid of prototypes for smbwrapper */ -#define _NO_PROTO - -#ifdef HAVE_SYS_CDEFS_H -#include -#ifdef __P -#undef __P -#define __P(x) () -#endif -#endif -#endif - #include "local.h" #ifdef AIX -- cgit From 8ed7427c1b2dfd021c6b4b93935f9fbbe7dffe0e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 7 Oct 1998 10:37:09 +0000 Subject: more solaris acl fixes (This used to be commit 1ad5bc381ab00f0699f025cb64db7cb4fa102c13) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2c4c09f675..fdfd1d3d37 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -224,6 +224,10 @@ #include #endif +#ifdef HAVE_SYS_ACL_H +#include +#endif + #ifdef HAVE_SYS_FS_S5PARAM_H #include #endif -- cgit From fc7d3e4caa7650c02ef36fff83b64b06050f66b1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 15 Oct 1998 00:55:17 +0000 Subject: config: Fix crypt prototype on RedHat Linux. include/includes.h: Fix crypt prototype on RedHat Linux. smbd/fileio.c: Fix mmap bug found by WinCE client. smbd/ipc.c: Fix WinCE wierdness with pipes being opened as \server\pipe\lanman smbd/password.c: Fix encrypted null passwords. Jeremy. (This used to be commit 475992730c0ecbf31c09b3518df2f0354cec61da) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fdfd1d3d37..59d43d8a36 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -674,6 +674,11 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid); int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif +#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL)) +/* stupid glibc */ +int crypt(const char *key, const char *salt); +#endif + #if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) #define bzero(a,b) memset((a),'\0',(b)) #endif -- cgit From fb556e14f3b47d5a1f465589084e8b30d84af8ca Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 24 Oct 1998 08:08:05 +0000 Subject: volker was concerned about unique inode numbers and smbsh. This set of changes uses the unique index number from a SMB_QUERY_FILE_ALL_INFO to try to provide inode numbers. If it is 0 then use the hash of the filename as before. (This used to be commit 2565ccf9de9d5e80fdb5bcadbc7130faba386d95) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 59d43d8a36..9d5ee28358 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -355,6 +355,12 @@ # endif #endif +#ifdef LARGE_SMB_INO_T +#define SINO_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#else +#define SINO_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#endif + #ifndef SMB_OFF_T # ifdef HAVE_OFF64_T # define SMB_OFF_T off64_t -- cgit From 94f7ce7624c22ce735c7b0f9a7079f41ac248af5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 28 Oct 1998 17:51:49 +0000 Subject: Quick fixes to fix the broken tree. Needed for my morning compiles. Chris - feel free to fix these things differently if these fixes don't work for you. Jeremy. (This used to be commit 1f225abfbe6b021b589711c2e4c599a63050c5b2) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9d5ee28358..1477c3ab3d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -494,6 +494,8 @@ extern int errno; #include "nterr.h" +#include "debugparse.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif @@ -680,7 +682,7 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid); int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif -#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL)) +#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL) && !defined(KRB4_AUTH)) /* stupid glibc */ int crypt(const char *key, const char *salt); #endif -- cgit From e81e3ce492e33f153b70d431c368d793ae898a5b Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Wed, 28 Oct 1998 20:24:41 +0000 Subject: Still moving things around. debugparse.h will be removed from the include directory in the next batch. Chris -)----- (This used to be commit 81f64d89924523279a2dcbe53d5355f3dd56b5ff) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1477c3ab3d..56ab47cecc 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -482,6 +482,8 @@ extern int errno; #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ +#include "debugparse.h" + #include "version.h" #include "smb.h" #include "smbw.h" @@ -494,8 +496,6 @@ extern int errno; #include "nterr.h" -#include "debugparse.h" - #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From 1e1c2ec93c204e6fd3ebba6dfb11e4fbc136e10c Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Tue, 10 Nov 1998 19:05:00 +0000 Subject: rpcclient registry commands. (This used to be commit 36fcb4a6e643a05d06a2a273d74318fee7f2c647) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 56ab47cecc..6c7a67afef 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -99,9 +99,13 @@ #include #endif +#ifdef MEM_MAN +#include "../mem_man/mem_man.h" +#else #ifdef HAVE_MALLOC_H #include #endif +#endif #ifdef HAVE_FCNTL_H #include -- cgit From 2db96e3047400be594e7c5ebf7d6fcedb77f6907 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 13 Nov 1998 03:37:01 +0000 Subject: fixes for OSF1 compilation (This used to be commit 5be3c37f50eac35cad3eadf0d24e7a4ee04c075e) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6c7a67afef..213053b0ec 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -587,6 +587,7 @@ union semun { #endif #if defined (HAVE_NETGROUP) && defined(HAVE_RPCSVC_YPCLNT_H) +#include "rpcsvc/yp_prot.h" #include "rpcsvc/ypclnt.h" #endif -- cgit From e623b717502988f630a73a5e809c456b1839ebdb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 13 Nov 1998 21:26:58 +0000 Subject: reverted includes change for FreeBSD as it breaks IRIX (This used to be commit 24b2bf1741366045eca02cbd09e3283531d28422) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 213053b0ec..6c7a67afef 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -587,7 +587,6 @@ union semun { #endif #if defined (HAVE_NETGROUP) && defined(HAVE_RPCSVC_YPCLNT_H) -#include "rpcsvc/yp_prot.h" #include "rpcsvc/ypclnt.h" #endif -- cgit From 8fc1504ff8204dd1ca735f31c769f6dadf0f88cb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 13 Nov 1998 21:41:01 +0000 Subject: Makefile.in configure configure.in include/config.h.in: Changes for DGUX and UNIXWARE. groupdb/aliasdb.c groupdb/aliasfile.c groupdb/groupfile.c: Don't use snprinf, use slprintf. include/includes.h: Fix YP problem. include/smb.h: Fix ZERO_STRUCTP. lib/util_sock.c: Added strerror() in debugs. passdb/ldap.c: Don't use snprinf, use slprintf. rpc_client/cli_lsarpc.c rpc_client/cli_pipe.c rpc_parse/parse_sec.c rpc_server/srv_pipe.c: Don't use snprinf, use slprintf. script/installman.sh: DGUX changes. smbd/open.c smbd/oplock.c: Fixed gcc warnings. web/swat.c: Changes USER to SWAT_USER. (This used to be commit 4c2b5a00983501e5d4aad1456ba8b5ab0dfd9b4c) --- source3/include/includes.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6c7a67afef..274d3ccf24 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -586,9 +586,17 @@ union semun { #define HAVE_NETGROUP 1 #endif -#if defined (HAVE_NETGROUP) && defined(HAVE_RPCSVC_YPCLNT_H) -#include "rpcsvc/ypclnt.h" +#if defined (HAVE_NETGROUP) +#if defined(HAVE_RPC_RPC_H) +#include #endif +#if defined(HAVE_RPCSVC_YP_PROT_H) +#include +#endif +#if defined(HAVE_RPCSVC_YPCLNT_H) +#include +#endif +#endif /* HAVE_NETGROUP */ #ifndef ALLOW_CHANGE_PASSWORD #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) -- cgit From 29cc8b8cd7326f0e83368f16d6666db3a674ae23 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Mon, 16 Nov 1998 01:12:36 +0000 Subject: Updates to handle glob.h - was causing problems on SCO 5.0.4 (This used to be commit 5f7d9d4656eb501e14b98f4ae1990a791c7901e3) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 274d3ccf24..fc718961a9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -161,7 +161,7 @@ #endif #endif -#ifdef HAVE_GLOB +#ifdef HAVE_GLOB_H #include #endif -- cgit From c1af0b40274752f85ba82f5a42426dbe3d3d890c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 17 Nov 1998 00:31:39 +0000 Subject: Moved PRINTCAP_NAME from smb.h to includes to allow it to be tuned per system type. Jeremy. (This used to be commit c1a3346547d887bfd2402a6b0bcc185680eb4470) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fc718961a9..24fb84c803 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -29,6 +29,7 @@ #ifdef AIX #define DEFAULT_PRINTING PRINT_AIX +#define PRINTCAP_NAME "/etc/qconfig" #endif #ifdef HPUX @@ -543,8 +544,10 @@ extern int errno; #ifndef DEFAULT_PRINTING #ifdef SYSV #define DEFAULT_PRINTING PRINT_SYSV +#define PRINTCAP_NAME "lpstat" #else #define DEFAULT_PRINTING PRINT_BSD +#define PRINTCAP_NAME "/etc/printcap" #endif #endif -- cgit From a491ec96fc9fa19a164febd45309a47504fddc16 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 18 Nov 1998 01:19:32 +0000 Subject: Fixed problem with HAVE_NETGROUP being used on platforms that cannot support it. Jeremy. (This used to be commit 7a6f25ac4ab0f0bef7a66f26004c15120248ff66) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 24fb84c803..92b415efa1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -585,7 +585,7 @@ union semun { #define HAVE_PAM 1 #endif -#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) #define HAVE_NETGROUP 1 #endif -- cgit From 9579b9823707b9acadfd7bf24d1c540eacf53fc0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 18 Nov 1998 22:04:24 +0000 Subject: Added OSF1 changes to HEAD (-lsecurity etc.) groupdb/groupdb.c: Fixed compile error caught by IRIX compiler. utils/smbpasswd.c: Fixed SunOS optind, optarg problem. Jeremy. (This used to be commit 30af39ae1edf51d5d06a1764982e5df431c142ac) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 92b415efa1..26bf872037 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -216,6 +216,15 @@ #include #endif +/* + * Seems to be needed by some OS's that complain + * about struct rtentry not being defined. + */ + +#ifdef HAVE_NET_ROUTE_H +#include +#endif + #ifdef HAVE_NET_IF_H #include #endif -- cgit From e204f1d8a3f54cb6bd8549b15a59af9a525b3392 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 19 Nov 1998 04:15:23 +0000 Subject: Changes to make the default prefix /usr/local/samba - as it was in 1.9.18p10. acconfig.h configure configure.in include/config.h.in: Fixes to DEC OSF1. libsmb/nmblib.c: Fixes to nmbd jumps in scope names. Jeremy. (This used to be commit 5ad77769be85e6727319afb0f02e5d94c2f9f16f) --- source3/include/includes.h | 65 ++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 22 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 26bf872037..9c5fa95a58 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -294,6 +294,23 @@ #include #endif +#if defined(HAVE_RPC_RPC_H) +#include +#endif + +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) +#define HAVE_NETGROUP 1 +#endif + +#if defined (HAVE_NETGROUP) +#if defined(HAVE_RPCSVC_YP_PROT_H) +#include +#endif +#if defined(HAVE_RPCSVC_YPCLNT_H) +#include +#endif +#endif /* HAVE_NETGROUP */ + #ifndef uchar #define uchar unsigned char #endif @@ -317,7 +334,7 @@ #define uint8 unsigned char #endif -#ifndef int16 +#if !defined(int16) && !defined(HAVE_INT16_FROM_RPC_RPC_H) #if (SIZEOF_SHORT == 4) #define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; #else /* SIZEOF_SHORT != 4 */ @@ -325,11 +342,20 @@ #endif /* SIZEOF_SHORT != 4 */ #endif -#ifndef uint16 -#define uint16 unsigned int16 +/* + * Note we duplicate the size tests in the unsigned + * case as int16 may be a typedef from rpc/rpc.h + */ + +#if !defined(uint16) && !defined(HAVE_UINT16_FROM_RPC_RPC_H) +#if (SIZEOF_SHORT == 4) +#define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; +#else /* SIZEOF_SHORT != 4 */ +#define uint16 unsigned short +#endif /* SIZEOF_SHORT != 4 */ #endif -#ifndef int32 +#if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H) #if (SIZEOF_INT == 4) #define int32 int #elif (SIZEOF_LONG == 4) @@ -339,8 +365,19 @@ #endif #endif -#ifndef uint32 -#define uint32 unsigned int32 +/* + * Note we duplicate the size tests in the unsigned + * case as int32 may be a typedef from rpc/rpc.h + */ + +#if !defined(uint32) && !defined(HAVE_UINT32_FROM_RPC_RPC_H) +#if (SIZEOF_INT == 4) +#define uint32 unsigned int +#elif (SIZEOF_LONG == 4) +#define uint32 unsigned long +#elif (SIZEOF_SHORT == 4) +#define uint32 unsigned short +#endif #endif /* @@ -594,22 +631,6 @@ union semun { #define HAVE_PAM 1 #endif -#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) -#define HAVE_NETGROUP 1 -#endif - -#if defined (HAVE_NETGROUP) -#if defined(HAVE_RPC_RPC_H) -#include -#endif -#if defined(HAVE_RPCSVC_YP_PROT_H) -#include -#endif -#if defined(HAVE_RPCSVC_YPCLNT_H) -#include -#endif -#endif /* HAVE_NETGROUP */ - #ifndef ALLOW_CHANGE_PASSWORD #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) #define ALLOW_CHANGE_PASSWORD 1 -- cgit From 4cee58780cb15fe5889b9dd0dc34459512d75062 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 23 Nov 1998 21:51:05 +0000 Subject: unix instance of group database API (This used to be commit e76f593b3572ac881f1aa1fb3326d8b7169b0078) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9c5fa95a58..1cc1ffde26 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -621,6 +621,7 @@ union semun { #if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) #define USE_SMBPASS_DB 1 +#define USE_SMBUNIX_DB 1 #endif #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS) -- cgit From d75712e52aadf66d6daef3daf26fdcc215e2d252 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 23 Nov 1998 23:02:16 +0000 Subject: get rid of __wait boring warning, caused by rpc/clnt.h (This used to be commit 0fdac4b42fb55a26cdd73d6d5f4a3017d1b4db46) --- source3/include/includes.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1cc1ffde26..96ff1fadf9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -46,6 +46,10 @@ #endif +#if defined(HAVE_RPC_RPC_H) +#include +#endif + #include #ifdef TIME_WITH_SYS_TIME @@ -294,23 +298,10 @@ #include #endif -#if defined(HAVE_RPC_RPC_H) -#include -#endif - #if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) #define HAVE_NETGROUP 1 #endif -#if defined (HAVE_NETGROUP) -#if defined(HAVE_RPCSVC_YP_PROT_H) -#include -#endif -#if defined(HAVE_RPCSVC_YPCLNT_H) -#include -#endif -#endif /* HAVE_NETGROUP */ - #ifndef uchar #define uchar unsigned char #endif -- cgit From f516cec31ad535c79cc4a3d8b7f12b45e1073605 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 23 Nov 1998 23:07:38 +0000 Subject: re-added includes for yp_prot.h and yp_clnt.h (This used to be commit 53339b63897f51913fef183fd3b4565dad2ffad1) --- source3/include/includes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 96ff1fadf9..a08efb2ad6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -298,10 +298,23 @@ #include #endif +#if defined(HAVE_RPC_RPC_H) +#include +#endif + #if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) #define HAVE_NETGROUP 1 #endif +#if defined (HAVE_NETGROUP) +#if defined(HAVE_RPCSVC_YP_PROT_H) +#include +#endif +#if defined(HAVE_RPCSVC_YPCLNT_H) +#include +#endif +#endif /* HAVE_NETGROUP */ + #ifndef uchar #define uchar unsigned char #endif -- cgit From bfc38ff872446e0ad365c22327c779e72a81bef9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 25 Nov 1998 21:17:20 +0000 Subject: Makefile.in: Added maintainer mode fixes. aclocal.m4: Added AC_LIBTESTFUNC. configure.in: Fixed -lsecurity -lsec problems. client.c: dos_ fixes. groupdb/aliasunix.c: Dead code removal. include/includes.h: Added default PRINTCAP_NAME. lib/genrand.c: dos_ fixes. lib/replace.c: Added strtoul. lib/system.c: dos_ fixes. lib/util.c: dos_ fixes. lib/util_sid.c: Signed/unsigned fixes. lib/util_str.c: removed bad const. locking/locking_slow.c: dos_ fixes. printing/printing.c: dos_ fixes. rpc_server/srv_samr.c: Dead code removal. rpc_server/srv_sid.c: global_myworkgroup defined with wrong size AGAIN ! smbd/dir.c: dos_ fixes. smbd/open.c: dos_ fixes. smbd/oplock.c: dos_ fixes. smbd/reply.c smbd/server.c smbd/service.c smbd/uid.c: dos_ fixes. Jeremy. (This used to be commit 6acb4b68f68d516e2ac3c47e500f5600d653435e) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a08efb2ad6..aeac177683 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -601,6 +601,10 @@ extern int errno; #endif #endif +#ifndef PRINTCAP_NAME +#define PRINTCAP_NAME "/etc/printcap" +#endif + #ifndef SIGCLD #define SIGCLD SIGCHLD #endif -- cgit From 534e6a2e1b22c1f40d8ba98300baff2c7e473aef Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 29 Nov 1998 09:29:24 +0000 Subject: removed include of net/route.h because it prevents compilation under SCO 3.2 (including it also requires lots of streams stuff, making it a total mess). If this causes problems on some other platform then please add a comment stating what platform and why the include is needed so we can work out how to test for it properly. (This used to be commit 21d779bf7def71d5d9c899eabbb6a110860bd8e2) --- source3/include/includes.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index aeac177683..82487c4e22 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -220,14 +220,16 @@ #include #endif +#if 0 /* - * Seems to be needed by some OS's that complain - * about struct rtentry not being defined. - */ - + * I have removed this as it prevents compilation under SCO Server + * 3.2. If you need to add it back in then please add a comment as to + * why it's needed and what OS it's needed for so we can work out how + * to test for it properly (tridge) */ #ifdef HAVE_NET_ROUTE_H #include #endif +#endif #ifdef HAVE_NET_IF_H #include -- cgit From 0712a56047f41d994bdb12eb15b96e6ce55b8f5b Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 30 Nov 1998 17:55:46 +0000 Subject: moving rpc/rpc.h to after netinet.h (This used to be commit 3257b72c6e2722a6de6b40b4c16e934c02a7c508) --- source3/include/includes.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 82487c4e22..58c6ee01bd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -46,10 +46,6 @@ #endif -#if defined(HAVE_RPC_RPC_H) -#include -#endif - #include #ifdef TIME_WITH_SYS_TIME @@ -74,6 +70,11 @@ #include #include +#include +#if defined(HAVE_RPC_RPC_H) +#include +#endif + #ifdef HAVE_SYS_PARAM_H #include #endif @@ -179,7 +180,6 @@ #include #endif -#include #include #include #include -- cgit From 5377f7ab3b05a2d56d73f6721c4db5cd41d859dc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 15 Dec 1998 03:16:24 +0000 Subject: on Linux force fcntl/mmap based shared memory and on other systems force IPC/shmem based shared memory. (This used to be commit ef5f752a4ae818d9c739a064410a02fa48a477e3) --- source3/include/includes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 58c6ee01bd..824a5bde5d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -46,6 +46,19 @@ #endif +/* if we have both SYSV IPC and shared mmap then we need to choose. For most + systems it is much faster to use SYSV IPC, but under Linux it is + about 5 times faster to use fcntl, so for Linux systems we force + fcntl based locking */ +#if (defined(HAVE_SYSV_IPC) && defined(HAVE_SHARED_MMAP)) +# ifdef LINUX +# undef HAVE_SYSV_IPC +# else +# undef HAVE_SHARED_MMAP +# endif +#endif + + #include #ifdef TIME_WITH_SYS_TIME -- cgit From dc003d8d408b87eecba9044d2d8732a3604827bf Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Wed, 16 Dec 1998 18:50:54 +0000 Subject: A while back, Andrew and I talked about making the debug parsing code a better "fit" with other Samba code. This is a small first step toward doing what (I think) we agreed to do. I've moved the key function from ubiqx/debugparse.c into lib/debug.c. I have also moved the enum from ubiqx/debugparse.h into the debug section in smb.h. The next thing to do is to get debug2html added into the Makefile.in so that it is always produced when compiling the suite. Chris -)----- (This used to be commit 782474f41e0c2bc0b1f098758a3e5cb44e87d8b1) --- source3/include/includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 824a5bde5d..a70de0b3a9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -552,8 +552,6 @@ extern int errno; #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ -#include "debugparse.h" - #include "version.h" #include "smb.h" #include "smbw.h" -- cgit From d973a107a2edac5ee2874eb6fdc005b9d32be379 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 17 Dec 1998 01:04:38 +0000 Subject: and in head branch: make sure we include sys/mman.h if available (This used to be commit ccf644388732287da01a943ea826187b5394ebc6) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a70de0b3a9..74aabc0b1f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -223,7 +223,7 @@ # endif #endif -#ifdef HAVE_SHARED_MMAP +#ifdef HAVE_SYS_MMAN_H #include #endif -- cgit From 81f866db3ab86a27dc93148676da6c96b6e56cbf Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Tue, 2 Mar 1999 16:43:27 +0000 Subject: added autoconf test. (This used to be commit 511ef8a58ccfc04d0744f28753bb48d848851980) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 74aabc0b1f..46bb4d9e5c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -330,6 +330,10 @@ #endif #endif /* HAVE_NETGROUP */ +#if defined(HAVE_MYSQL_H) +#include +#endif + #ifndef uchar #define uchar unsigned char #endif -- cgit From 26c08067f0b3a1dc8b8304eeba27879ed586e3b0 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 8 Mar 1999 18:41:58 +0000 Subject: Bejamin Kuit. #define MYSQL and MYSQL_ROW to void iff not found. (This used to be commit 188d9a75edb41e8a0cc0ea6e17c9497771cf3b96) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 46bb4d9e5c..0d2561f6bc 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -332,6 +332,10 @@ #if defined(HAVE_MYSQL_H) #include +#else +/* needed to get make proto to work with no */ +#define MYSQL void +#define MYSQL_ROW void #endif #ifndef uchar -- cgit From d330c907bdc5d8e3c242cea76dfafaae84041270 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 1 Apr 1999 05:22:58 +0000 Subject: Ken McDonell from SGI was interested in adding some profiling capabilities to Samba so that Samba could talk to the SGI PCP (Performance Co-Pilot) apps. This change adds a profiling shared memory area and uses it to count two fairly trivial things, the number of uid switches and the number of SMB packets processes. To add more just edit include/profile.h and then increment it at the right place. I've also added a -P switch to smbstatus to dump the profile area. (This used to be commit ef3d61a80ad0b87c196a63ef2bd4fe8fc3863bd0) --- source3/include/includes.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0d2561f6bc..b880689600 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -46,16 +46,12 @@ #endif -/* if we have both SYSV IPC and shared mmap then we need to choose. For most - systems it is much faster to use SYSV IPC, but under Linux it is - about 5 times faster to use fcntl, so for Linux systems we force - fcntl based locking */ +/* if we have both SYSV IPC and shared mmap then we need to + choose. For most systems it is much faster to use SYSV IPC. We used + to make an exception for Linux, but now Linux 2.2 has made it + better to use sysv if possible */ #if (defined(HAVE_SYSV_IPC) && defined(HAVE_SHARED_MMAP)) -# ifdef LINUX -# undef HAVE_SYSV_IPC -# else # undef HAVE_SHARED_MMAP -# endif #endif @@ -572,6 +568,10 @@ extern int errno; #include "nterr.h" +#ifdef WITH_PROFILE +#include "profile.h" +#endif + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif @@ -705,6 +705,14 @@ union semun { #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) #endif +#ifndef SHM_R +#define SHM_R (0400) +#endif + +#ifndef SHM_W +#define SHM_W (0200) +#endif + #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) #define ULTRIX_AUTH 1 #endif -- cgit From 60e08bd35e78bff3a395090c1d41bb16da0252a5 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 9 Jul 1999 01:59:22 +0000 Subject: Hived off string routines into a separate file. (This used to be commit 4929513f1376d72409c1e5a39f723d1d2bd81dc0) --- source3/include/includes.h | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b880689600..1a37eb20c1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -579,25 +579,9 @@ extern int errno; /***** automatically generated prototypes *****/ #include "proto.h" -#ifdef strcpy -#undef strcpy -#endif /* strcpy */ -#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; - -#ifdef strcat -#undef strcat -#endif /* strcat */ -#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; - -#ifdef sprintf -#undef sprintf -#endif /* sprintf */ -#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; - -#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) -#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) -#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) -#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) +/* String routines */ + +#include "safe_string.h" #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) -- cgit From 59bd1de1a56870490d48c6fcf44b53f88ab22108 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 9 Jul 1999 03:34:09 +0000 Subject: Put back in GNU readline support for smbclient accidentally trashed by tridge in the clientgen.c to clientutil.c conversion. (This used to be commit 26d66071fbac2c46445153c214bb13d587a67b49) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1a37eb20c1..efaebdf182 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -717,6 +717,14 @@ union semun { # undef HAVE_LIBREADLINE # endif # endif + +/* Some old versions of readline don't define a prototype for + filename_completion_function() */ + +# ifndef HAVE_READLINE_FCF_PROTO +extern char *filename_completion_function (); +# endif + #endif #ifndef HAVE_STRDUP -- cgit From fcf0300ffeb7028ea5d4e1d3b6f575e43f4eb110 Mon Sep 17 00:00:00 2001 From: Matthew Chapman Date: Sun, 8 Aug 1999 04:44:36 +0000 Subject: Some compilers want (void) instead of just () in function declarations. (This used to be commit c086c7ab94d676e22801bc78588c116cf2e5a4eb) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index efaebdf182..03d1b3424b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -722,7 +722,7 @@ union semun { filename_completion_function() */ # ifndef HAVE_READLINE_FCF_PROTO -extern char *filename_completion_function (); +char *filename_completion_function(void); # endif #endif -- cgit From d7889cd22347e7acd4effb7682d442eef7a666e4 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Wed, 24 Nov 1999 18:09:33 +0000 Subject: rewrote policy handle code to be generic (it's needed for client-side too) attempted to fix regsetsec command (This used to be commit eaac0923e0e5e3f4c3d944272a71f3235ac2a741) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 03d1b3424b..4437e8710f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -669,6 +669,10 @@ union semun { #define MAXPATHLEN 256 #endif +#ifndef MAX_SERVER_POLICY_HANDLES +#define MAX_SERVER_POLICY_HANDLES 64 +#endif + #ifndef SEEK_SET #define SEEK_SET 0 #endif -- cgit From 6ddfc68e0496dc41f8c9a022a0b04a2066b43c9d Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Wed, 1 Dec 1999 02:15:14 +0000 Subject: sys_select added one more argument (read, write selectors). (This used to be commit e4d92ff9dfc51735e6932748f66a7c20b2c1cb6a) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4437e8710f..1379494ecb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -55,6 +55,7 @@ #endif +#include #include #ifdef TIME_WITH_SYS_TIME -- cgit From 6281c5d7a94d8f5bfec835aa147e7aa8bab15bb2 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Wed, 8 Dec 1999 22:57:34 +0000 Subject: moved sys/un.h to after sys/socket.h. done a gnu autoconf around sys/un.h (This used to be commit b2ea37a8f1a28a825719b46354a1244b359aca2c) --- source3/include/includes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1379494ecb..ee3989d028 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -55,7 +55,6 @@ #endif -#include #include #ifdef TIME_WITH_SYS_TIME @@ -97,6 +96,10 @@ #include #endif +#ifdef HAVE_SYS_UN_H +#include +#endif + #ifdef HAVE_SYS_SYSCALL_H #include #elif HAVE_SYSCALL_H -- cgit From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Dec 1999 13:27:58 +0000 Subject: first pass at updating head branch to be to be the same as the SAMBA_2_0 branch (This used to be commit 453a822a76780063dff23526c35408866d0c0154) --- source3/include/includes.h | 240 +++++++++++++++++++++++++++++++-------------- 1 file changed, 164 insertions(+), 76 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ee3989d028..2a10badd73 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -45,16 +45,35 @@ #undef HAVE_TERMIOS_H #endif +#ifdef LINUX +#define DEFAULT_PRINTING PRINT_BSD +#define PRINTCAP_NAME "/etc/printcap" +#endif + +#ifdef RELIANTUNIX +/* + * has to be included before any other to get + * large file support on Reliant UNIX + */ +#ifdef HAVE_UNISTD_H +#include +#endif +#endif /* RELIANTUNIX */ + +#ifdef HAVE_SYSV_IPC +#define USE_SYSV_IPC +#endif -/* if we have both SYSV IPC and shared mmap then we need to - choose. For most systems it is much faster to use SYSV IPC. We used - to make an exception for Linux, but now Linux 2.2 has made it - better to use sysv if possible */ -#if (defined(HAVE_SYSV_IPC) && defined(HAVE_SHARED_MMAP)) -# undef HAVE_SHARED_MMAP +#ifdef HAVE_SHARED_MMAP +#define USE_SHARED_MMAP #endif +/* if we have both SYSV IPC and shared mmap then we need to choose */ +#if (defined(USE_SYSV_IPC) && defined(USE_SHARED_MMAP)) +# undef USE_SHARED_MMAP +#endif + #include #ifdef TIME_WITH_SYS_TIME @@ -79,11 +98,6 @@ #include #include -#include -#if defined(HAVE_RPC_RPC_H) -#include -#endif - #ifdef HAVE_SYS_PARAM_H #include #endif @@ -96,10 +110,6 @@ #include #endif -#ifdef HAVE_SYS_UN_H -#include -#endif - #ifdef HAVE_SYS_SYSCALL_H #include #elif HAVE_SYSCALL_H @@ -159,6 +169,9 @@ #ifdef HAVE_GRP_H #include #endif +#ifdef HAVE_SYS_PRIV_H +#include +#endif #ifdef HAVE_SYS_ID_H #include #endif @@ -193,6 +206,7 @@ #include #endif +#include #include #include #include @@ -202,8 +216,32 @@ #include #endif -#ifdef HAVE_TERMIOS_H +/* + * The next three defines are needed to access the IPTOS_* options + * on some systems. + */ + +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif + +#ifdef HAVE_NETINET_IN_IP_H +#include +#endif + +#ifdef HAVE_NETINET_IP_H +#include +#endif + +#if defined(HAVE_TERMIOS_H) +/* POSIX terminal handling. */ #include +#elif defined(HAVE_TERMIO_H) +/* Older SYSV terminal handling - don't use if we can avoid it. */ +#include +#elif defined(HAVE_SYS_TERMIO_H) +/* Older SYSV terminal handling - don't use if we can avoid it. */ +#include #endif #if HAVE_DIRENT_H @@ -233,17 +271,6 @@ #include #endif -#if 0 -/* - * I have removed this as it prevents compilation under SCO Server - * 3.2. If you need to add it back in then please add a comment as to - * why it's needed and what OS it's needed for so we can work out how - * to test for it properly (tridge) */ -#ifdef HAVE_NET_ROUTE_H -#include -#endif -#endif - #ifdef HAVE_NET_IF_H #include #endif @@ -314,6 +341,12 @@ #endif #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 #include #endif @@ -330,12 +363,24 @@ #endif #endif /* HAVE_NETGROUP */ -#if defined(HAVE_MYSQL_H) -#include +/* + * Define VOLATILE if needed. + */ + +#if defined(HAVE_VOLATILE) +#define VOLATILE volatile #else -/* needed to get make proto to work with no */ -#define MYSQL void -#define MYSQL_ROW void +#define VOLATILE +#endif + +/* + * Define SIG_ATOMIC_T if needed. + */ + +#if defined(HAVE_SIG_ATOMIC_T_TYPE) +#define SIG_ATOMIC_T sig_atomic_t +#else +#define SIG_ATOMIC_T int #endif #ifndef uchar @@ -420,7 +465,7 @@ */ #ifndef SMB_INO_T -# ifdef HAVE_INO64_T +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_INO64_T) # define SMB_INO_T ino64_t # else # define SMB_INO_T ino_t @@ -428,7 +473,7 @@ #endif #ifndef LARGE_SMB_INO_T -# if defined(HAVE_INO64_T) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8)) +# if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_INO64_T)) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8)) # define LARGE_SMB_INO_T 1 # endif #endif @@ -440,7 +485,7 @@ #endif #ifndef SMB_OFF_T -# ifdef HAVE_OFF64_T +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) # define SMB_OFF_T off64_t # else # define SMB_OFF_T off_t @@ -455,7 +500,7 @@ */ #ifndef LARGE_SMB_OFF_T -# if defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) +# if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T)) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) # define LARGE_SMB_OFF_T 1 # endif #endif @@ -471,19 +516,31 @@ */ #ifndef SMB_STRUCT_STAT -# if defined(HAVE_STAT64) && defined(HAVE_OFF64_T) +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STAT64) && defined(HAVE_OFF64_T) # define SMB_STRUCT_STAT struct stat64 # else # define SMB_STRUCT_STAT struct stat # endif #endif +/* + * Type for dirent structure. + */ + +#ifndef SMB_STRUCT_DIRENT +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_DIRENT64) +# define SMB_STRUCT_DIRENT struct dirent64 +# else +# define SMB_STRUCT_DIRENT struct dirent +# endif +#endif + /* * Defines for 64 bit fcntl locks. */ #ifndef SMB_STRUCT_FLOCK -# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) # define SMB_STRUCT_FLOCK struct flock64 # else # define SMB_STRUCT_FLOCK struct flock @@ -491,7 +548,7 @@ #endif #ifndef SMB_F_SETLKW -# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) # define SMB_F_SETLKW F_SETLKW64 # else # define SMB_F_SETLKW F_SETLKW @@ -499,7 +556,7 @@ #endif #ifndef SMB_F_SETLK -# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) # define SMB_F_SETLK F_SETLK64 # else # define SMB_F_SETLK F_SETLK @@ -507,7 +564,7 @@ #endif #ifndef SMB_F_GETLK -# if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) # define SMB_F_GETLK F_GETLK64 # else # define SMB_F_GETLK F_GETLK @@ -517,9 +574,11 @@ #if defined(HAVE_LONGLONG) #define SMB_BIG_UINT unsigned long long #define SMB_BIG_INT long long +#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) #else #define SMB_BIG_UINT unsigned long #define SMB_BIG_INT long +#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) #endif #ifndef MIN @@ -555,11 +614,20 @@ extern int errno; #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" +#include "interfaces.h" + +#ifdef HAVE_FNMATCH +#include +#else +#include "fnmatch.h" +#endif #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ +#include "debugparse.h" + #include "version.h" #include "smb.h" #include "smbw.h" @@ -583,9 +651,25 @@ extern int errno; /***** automatically generated prototypes *****/ #include "proto.h" -/* String routines */ +#ifdef strcpy +#undef strcpy +#endif /* strcpy */ +#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; + +#ifdef strcat +#undef strcat +#endif /* strcat */ +#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; + +#ifdef sprintf +#undef sprintf +#endif /* sprintf */ +#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; -#include "safe_string.h" +#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) +#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) +#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) +#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) @@ -596,12 +680,15 @@ extern int errno; #endif /* this guess needs to be improved (tridge) */ -#if defined(STAT_STATVFS) && !defined(SYSV) +#if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV) #define SYSV 1 #endif #ifndef DEFAULT_PRINTING -#ifdef SYSV +#ifdef HAVE_LIBCUPS +#define DEFAULT_PRINTING PRINT_CUPS +#define PRINTCAP_NAME "cups" +#elif defined(SYSV) #define DEFAULT_PRINTING PRINT_SYSV #define PRINTCAP_NAME "lpstat" #else @@ -638,17 +725,12 @@ union semun { #if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) #define USE_SMBPASS_DB 1 -#define USE_SMBUNIX_DB 1 #endif #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS) #define OSF1_ENH_SEC 1 #endif -#if defined(HAVE_PAM_AUTHENTICATE) && defined(HAVE_SECURITY_PAM_APPL_H) -#define HAVE_PAM 1 -#endif - #ifndef ALLOW_CHANGE_PASSWORD #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) #define ALLOW_CHANGE_PASSWORD 1 @@ -673,10 +755,6 @@ union semun { #define MAXPATHLEN 256 #endif -#ifndef MAX_SERVER_POLICY_HANDLES -#define MAX_SERVER_POLICY_HANDLES 64 -#endif - #ifndef SEEK_SET #define SEEK_SET 0 #endif @@ -697,14 +775,6 @@ union semun { #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) #endif -#ifndef SHM_R -#define SHM_R (0400) -#endif - -#ifndef SHM_W -#define SHM_W (0200) -#endif - #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) #define ULTRIX_AUTH 1 #endif @@ -725,14 +795,6 @@ union semun { # undef HAVE_LIBREADLINE # endif # endif - -/* Some old versions of readline don't define a prototype for - filename_completion_function() */ - -# ifndef HAVE_READLINE_FCF_PROTO -char *filename_completion_function(void); -# endif - #endif #ifndef HAVE_STRDUP @@ -759,15 +821,16 @@ time_t mktime(struct tm *t); int ftruncate(int f,long l); #endif -#if (defined(HAVE_SETRESUID) && !defined(HAVE_SETRESUID_DECL)) -/* stupid glibc */ -int setresuid(uid_t ruid, uid_t euid, uid_t suid); -int setresgid(gid_t rgid, gid_t egid, gid_t sgid); +#ifndef HAVE_STRTOUL +unsigned long strtoul(const char *nptr, char **endptr, int base); #endif -#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL) && !defined(KRB4_AUTH)) +#if (defined(USE_SETRESUID) && !defined(HAVE_SETRESUID_DECL)) /* stupid glibc */ -int crypt(const char *key, const char *salt); +int setresuid(uid_t ruid, uid_t euid, uid_t suid); +#endif +#if (defined(USE_SETRESUID) && !defined(HAVE_SETRESGID_DECL)) +int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif #if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) @@ -778,7 +841,32 @@ int crypt(const char *key, const char *salt); #define getpass(prompt) getsmbpass((prompt)) #endif +/* + * Some older systems seem not to have MAXHOSTNAMELEN + * defined. + */ +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 254 +#endif + /* yuck, I'd like a better way of doing this */ #define DIRP_SIZE (256 + 32) +/* + * glibc on linux doesn't seem to have MSG_WAITALL + * defined. I think the kernel has it though.. + */ + +#ifndef MSG_WAITALL +#define MSG_WAITALL 0 +#endif + +/* default socket options. Dave Miller thinks we should default to TCP_NODELAY + given the socket IO pattern that Samba uses */ +#ifdef TCP_NODELAY +#define DEFAULT_SOCKET_OPTIONS "TCP_NODELAY" +#else +#define DEFAULT_SOCKET_OPTIONS "" +#endif + #endif /* _INCLUDES_H */ -- cgit From c2c42b8694be0b2ce271613153cca71dc8e83a9f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 21 Dec 1999 03:04:37 +0000 Subject: first pass at the database code for Samba. This also includes a test suite and a very simple tool for manuipulating the databases. the main code is in tdb/tdb.c and includes both mmap and file based IO. All databases auto-expand and allow multiple simultaneous writers. the next step is using this new capability in lots of places in Samba where we have existing ad-hoc databases (This used to be commit c89d29cc5e3b6d568928acace01144059f1668b3) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2a10badd73..e8eb8e28ea 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -614,6 +614,7 @@ extern int errno; #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" +#include "../tdb/tdb.h" #include "interfaces.h" #ifdef HAVE_FNMATCH -- cgit From e7851ce52e408db4d78a45066ed042708203e7a1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 22 Dec 1999 01:29:22 +0000 Subject: First cut at unicode sys_xx functions. Now to start moving upwards..... Jeremy. (This used to be commit b5eb009cc3cfd1adc044e91911d59acdb54c30cb) --- source3/include/includes.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e8eb8e28ea..b42f5e0115 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -649,6 +649,31 @@ extern int errno; #define MAXCODEPAGELINES 256 #endif +/* + * Type for wide character dirent structure. + */ + +typedef struct smb_wdirent { + SMB_INO_T d_ino; + SMB_OFF_T d_off; + unsigned short d_reclen; + wpstring d_name; +} SMB_STRUCT_WDIRENT; + +/* + * Type for wide character passwd structure. + */ + +typedef struct smb_wpasswd { + wfstring pw_name; + char *pw_passwd; + uid_t pw_uid; + gid_t pw_gid; + wpstring pw_gecos; + wpstring pw_dir; + wpstring pw_shell; +} SMB_STRUCT_WPASSWD; + /***** automatically generated prototypes *****/ #include "proto.h" -- cgit From 5b3096a32fff88cb5f5388402f327da7b3d3dc18 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 22 Dec 1999 18:46:05 +0000 Subject: include/includes.h: Trimmed down unicode directory entry to be POSIX complient. lib/system.c: Trimmed down unicode directory entry to be POSIX complient. lib/util_unistr.c: Added wstrdup(). Jeremy. (This used to be commit ca64f4ab00c6d54022ba9bd4b869523566a242d7) --- source3/include/includes.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b42f5e0115..0e8505daec 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -651,12 +651,10 @@ extern int errno; /* * Type for wide character dirent structure. + * Only d_name is defined by POSIX. */ typedef struct smb_wdirent { - SMB_INO_T d_ino; - SMB_OFF_T d_off; - unsigned short d_reclen; wpstring d_name; } SMB_STRUCT_WDIRENT; -- cgit From 7c51c5ddf31cc990610d07edb1cbe7265288e2c3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 23 Dec 1999 01:57:43 +0000 Subject: Samba now includes a full ucs2 upper to lower case (and vica versa) map table. Jeremy. (This used to be commit d7b72d4cbfb6bd1925abc7f95c1180d3d65856a5) --- source3/include/includes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0e8505daec..0dd12bc989 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -672,6 +672,13 @@ typedef struct smb_wpasswd { wpstring pw_shell; } SMB_STRUCT_WPASSWD; +/* Defines for wisXXX functions. */ +#define UNI_UPPER 0x1 +#define UNI_LOWER 0x2 +#define UNI_DIGIT 0x4 +#define UNI_XDIGIT 0x8 +#define UNI_SPACE 0x10 + /***** automatically generated prototypes *****/ #include "proto.h" @@ -695,6 +702,12 @@ typedef struct smb_wpasswd { #define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) #define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) +/* smb_ucs2_t versions of the above. */ +#define wpstrcpy(d,s) safe_wstrcpy((d),(s),sizeof(wpstring)) +#define wpstrcat(d,s) safe_wstrcat((d),(s),sizeof(wpstring)) +#define wfstrcpy(d,s) safe_wstrcpy((d),(s),sizeof(wfstring)) +#define wfstrcat(d,s) safe_wstrcat((d),(s),sizeof(wfstring)) + #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) #endif -- cgit From 211697ee6cbeb2bbe86b96e17b922dd16d45c0e9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 29 Dec 1999 02:00:38 +0000 Subject: Converted most of the functions in lib/util_str.c to smb_ucs2_t equivalents. Jeremy. (This used to be commit 1ba42aca2163c534f6be4e4a733604e3dffe0ed8) --- source3/include/includes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0dd12bc989..3fcec98f32 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -703,10 +703,10 @@ typedef struct smb_wpasswd { #define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) /* smb_ucs2_t versions of the above. */ -#define wpstrcpy(d,s) safe_wstrcpy((d),(s),sizeof(wpstring)) -#define wpstrcat(d,s) safe_wstrcat((d),(s),sizeof(wpstring)) -#define wfstrcpy(d,s) safe_wstrcpy((d),(s),sizeof(wfstring)) -#define wfstrcat(d,s) safe_wstrcat((d),(s),sizeof(wfstring)) +#define wpstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wpstring)) +#define wpstrcat(d,s) safe_strcat_w((d),(s),sizeof(wpstring)) +#define wfstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wfstring)) +#define wfstrcat(d,s) safe_strcat_w((d),(s),sizeof(wfstring)) #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) -- cgit From d705b62141d092a5a9ca4e905bab2d1f1a1c3e9e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 3 Jan 2000 03:31:41 +0000 Subject: got rid of mem_man yamd is much better, and doesn't require any source code changes if you haven't seen yamd then take a look at http://www3.hmc.edu/~neldredge/yamd/ its excellent! (This used to be commit 25b13f8b79d648188036f027f45bc78ec117cc88) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3fcec98f32..3e9010bf54 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -128,13 +128,9 @@ #include #endif -#ifdef MEM_MAN -#include "../mem_man/mem_man.h" -#else #ifdef HAVE_MALLOC_H #include #endif -#endif #ifdef HAVE_FCNTL_H #include -- cgit From 5e9f5591873fc5c5b5c8dbb0e29a080b8afe9966 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 5 Jan 2000 06:36:36 +0000 Subject: implemented talloc() as described on samba-technical. This fixes the lp_string() bug properly. we still need to add lp_talloc_free() calls in all the main event loops, I've only put it in smbd and nmbd thus far. (This used to be commit aa7f81552540f5dca2c146f5edd805611d5b390f) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3e9010bf54..7986c12c91 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -611,6 +611,7 @@ extern int errno; #include "ubi_dLinkList.h" #include "dlinklist.h" #include "../tdb/tdb.h" +#include "talloc.h" #include "interfaces.h" #ifdef HAVE_FNMATCH -- cgit From 5983a77020a27dd6d7591107070e5167833727d2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 5 Jan 2000 23:46:47 +0000 Subject: Moved check_plaintext_password() into smbd/chgpasswd.c from smbd/ipc.c. configure configure.in include/config.h.in: Added autoconf code for Luke's UNIX domain sockets code. Jeremy. (This used to be commit 210d61db08136122f51a93428607fccd582c9e7d) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7986c12c91..e2139345c0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -110,6 +110,10 @@ #include #endif +#ifdef HAVE_SYS_UN_H +#include +#endif + #ifdef HAVE_SYS_SYSCALL_H #include #elif HAVE_SYSCALL_H -- cgit From fab3e0eb08ce3f479131eaea040f3d9215caa038 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 8 Jan 2000 02:16:15 +0000 Subject: smbd/mangle.c smbd/negprot.c: Tidyup of static initializers. smbd/server.c: Fix -l option. Jeremy. (This used to be commit d120f22fefde21b38e43ea5ad0180bf27304d2eb) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e2139345c0..4177189d6e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -198,7 +198,6 @@ #endif #include -#include #ifdef HAVE_STDARG_H #include -- cgit From e18a2cad693c94c2c98f00710150dcb36c55db90 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 13 Jan 2000 12:05:40 +0000 Subject: defined br_off as a type for byte range offsets. For now I've set it as SMB_OFF_T, we need to do some autoconf changes to generate a 64 bit int whenever possible (eg. long long on 32 bit i386) (This used to be commit 09dbe8bccec244c8ea0893a7d8ca4fe85d5420f7) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4177189d6e..b618178c5f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -491,6 +491,9 @@ # endif #endif +/* this should really be a 64 bit type if possible */ +#define br_off SMB_OFF_T + #define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8) /* -- cgit From 0cbae6fc3dda6a09ae99a0cf9a72bd21543a1e12 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 16 Jan 2000 11:06:00 +0000 Subject: make a br_off a SMB_BIG_UINT (This used to be commit 0751a0ea4cdb7f5db0aa6f359dd3e4f744fc0689) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b618178c5f..a872c1d306 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -492,7 +492,7 @@ #endif /* this should really be a 64 bit type if possible */ -#define br_off SMB_OFF_T +#define br_off SMB_BIG_UINT #define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8) -- cgit From ace4006c9f7ac16b3c09b1b2222f607bccfa040e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 26 Jan 2000 21:25:35 +0000 Subject: Added hash-based stat cache code from Ying Chen. Jeremy. (This used to be commit b62a1bd6328f5894ae1a2fef3ef6fc66304ade52) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a872c1d306..a049b725c4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -619,6 +619,7 @@ extern int errno; #include "../tdb/tdb.h" #include "talloc.h" #include "interfaces.h" +#include "hash.h" #ifdef HAVE_FNMATCH #include -- cgit From 04f7d80ac358520c0d6e351f790f59208853130a Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 3 Feb 2000 04:47:50 +0000 Subject: Busting up of source/include/smb.h into smaller pieces which can be #included by VFS modules without bringing in too much other junk. (This used to be commit 13a2cf80f65156e725a5716e62a4c44e70f5340f) --- source3/include/includes.h | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a049b725c4..5b3af75c04 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -686,31 +686,9 @@ typedef struct smb_wpasswd { /***** automatically generated prototypes *****/ #include "proto.h" -#ifdef strcpy -#undef strcpy -#endif /* strcpy */ -#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; - -#ifdef strcat -#undef strcat -#endif /* strcat */ -#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; - -#ifdef sprintf -#undef sprintf -#endif /* sprintf */ -#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; - -#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) -#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) -#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) -#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) - -/* smb_ucs2_t versions of the above. */ -#define wpstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wpstring)) -#define wpstrcat(d,s) safe_strcat_w((d),(s),sizeof(wpstring)) -#define wfstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wfstring)) -#define wfstrcat(d,s) safe_strcat_w((d),(s),sizeof(wfstring)) +/* String routines */ + +#include "safe_string.h" #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) @@ -910,4 +888,10 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define DEFAULT_SOCKET_OPTIONS "" #endif +/* Load header file for libdl stuff */ + +#ifdef HAVE_LIBDL +#include +#endif + #endif /* _INCLUDES_H */ -- cgit From 868c81eefa72b31023eeac32788eaa439013c0f8 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 7 Feb 2000 14:27:04 +0000 Subject: Added check for SGI IRIX brokenness with semaphores when using gcc. Code from Don Badrak Jeremy. (This used to be commit 773d6e504b1ac97f0d8136002ace2c0c0771a163) --- source3/include/includes.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b3af75c04..127e6d59af 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -268,7 +268,24 @@ #include #include #include -#endif + +/* + * The following is needed if compiling + * with gcc on SGI IRIX 6.5.x systems as + * the structure packing for system calls is + * different between IRIX cc and gcc. + */ + +#ifdef NEED_SGI_SEMUN_HACK +union semun_hack { + int val; + struct semid_ds *buf; + unsigned short *array; + char __dummy[5]; +}; +#define semun semun_hack +#endif /* NEED_SGI_SEMUN_HACK */ +#endif /* HAVE_SYSV_IPC */ #ifdef HAVE_NET_IF_H #include -- cgit From 3cf31a194f5721b67b1255e3f168d4bc87d433fc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 15 Feb 2000 19:36:47 +0000 Subject: Added replacement functions sys_popen and sys_pclose. These are based on the glibc source code and are safer than the traditional popen as they don't use a shell to exec the requested command. Now we have these functions they can be tightened up (environment etc.) as required to make a safe popen. It should now be safe to add the environement variable loading code to loadparm.c Jeremy. (This used to be commit b52e92b09d4ca3b66e534f520468dee27065d048) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 127e6d59af..1929df3b7d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -628,6 +628,9 @@ extern int errno; #define GID_T gid_t #endif +#ifndef NGROUPS_MAX +#define NGROUPS_MAX 32 /* Guess... */ +#endif /* Lists, trees, caching, datbase... */ #include "ubi_sLinkList.h" -- cgit From 952799d9afe028d822181831715b85521c89a7ef Mon Sep 17 00:00:00 2001 From: Shirish Kalele Date: Wed, 8 Mar 2000 22:14:30 +0000 Subject: dded Microsoft Dfs services. * added a new msdfs/ directory under source/ * added msdfs sources under this directory. * modified configure setup to add a --with-msdfs configure time option Modified Files: Makefile.in acconfig.h configure configure.in include/config.h.in include/includes.h include/proto.h include/smb.h include/smb_macros.h param/loadparm.c smbd/negprot.c smbd/nttrans.c smbd/process.c smbd/reply.c smbd/server.c smbd/trans2.c Added Files: include/msdfs.h msdfs/README msdfs/msdfs.c msdfs/msdfs_tdb.c msdfs/parse_dfs_map.c ---------------------------------------------------------------------- (This used to be commit 4684b4a188b54493dbe7f0de2909a8d3c5c3ebf9) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1929df3b7d..d040dada7a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -914,4 +914,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif +#include "msdfs.h" + #endif /* _INCLUDES_H */ -- cgit From 6bb92a6d38db41a11e80c4369623d137763f0f52 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 9 Mar 2000 21:45:16 +0000 Subject: Big update moving the multi-pdu support from 2.0.x into HEAD for JF and the printer functions. Also tidied up some header includes and got the order right so you can now do a : make proto make clean make Jeremy. (This used to be commit 833cd9fba92e4ad5297b235d108dd2be8c17079b) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d040dada7a..f77e1323d7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -665,6 +665,8 @@ extern int errno; #include "nterr.h" +#include "msdfs.h" + #ifdef WITH_PROFILE #include "profile.h" #endif @@ -914,6 +916,4 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif -#include "msdfs.h" - #endif /* _INCLUDES_H */ -- cgit From f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 11 Apr 2000 19:44:54 +0000 Subject: include/byteorder.h: ALIGN4/ALIGN2 macros. include/includes.h: Added SMB_BIG_UINT_BITS. lib/util.c: Removed align2/align4 - use macros. libsmb/namequery.c: Use ALIGN2. locking/locking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T. Needed to move to hiding POSIX locks at a lower layer. nmbd/nmbd_processlogon.c: Use ALIGN2/ALIGN4 macros. smbd/blocking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T. smbd/reply.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T. Jeremy. (This used to be commit 491eea8a20bf80d426625479326211dc975857a6) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f77e1323d7..5bc4797cb4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -600,6 +600,8 @@ union semun_hack { #define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) #endif +#define SMB_BIG_UINT_BITS (sizeof(SMB_BIG_UINT)*8) + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -- cgit From d99bec71701d611b0d8ee44d92cb8ed28162af56 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 17 Apr 2000 06:11:08 +0000 Subject: got rid of some more old configure tests and includes (This used to be commit f137648504362479143d50477fa38ebf7147968b) --- source3/include/includes.h | 51 ---------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5bc4797cb4..e19295834a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -60,20 +60,6 @@ #endif #endif /* RELIANTUNIX */ -#ifdef HAVE_SYSV_IPC -#define USE_SYSV_IPC -#endif - -#ifdef HAVE_SHARED_MMAP -#define USE_SHARED_MMAP -#endif - - -/* if we have both SYSV IPC and shared mmap then we need to choose */ -#if (defined(USE_SYSV_IPC) && defined(USE_SHARED_MMAP)) -# undef USE_SHARED_MMAP -#endif - #include #ifdef TIME_WITH_SYS_TIME @@ -264,29 +250,6 @@ #include #endif -#ifdef HAVE_SYSV_IPC -#include -#include -#include - -/* - * The following is needed if compiling - * with gcc on SGI IRIX 6.5.x systems as - * the structure packing for system calls is - * different between IRIX cc and gcc. - */ - -#ifdef NEED_SGI_SEMUN_HACK -union semun_hack { - int val; - struct semid_ds *buf; - unsigned short *array; - char __dummy[5]; -}; -#define semun semun_hack -#endif /* NEED_SGI_SEMUN_HACK */ -#endif /* HAVE_SYSV_IPC */ - #ifdef HAVE_NET_IF_H #include #endif @@ -748,24 +711,10 @@ typedef struct smb_wpasswd { #define SIGCLD SIGCHLD #endif -#if (defined(HAVE_SYSV_IPC) || defined(HAVE_SHARED_MMAP)) -#define FAST_SHARE_MODES 1 -#endif - #ifndef MAP_FILE #define MAP_FILE 0 #endif -#ifdef HAVE_SYSV_IPC -#ifndef HAVE_UNION_SEMUN -union semun { - int val; - struct semid_ds *buf; - unsigned short *array; -}; -#endif -#endif - #if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) #define USE_SMBPASS_DB 1 #endif -- cgit From 00e3fe132476fcaed0f4b9bbe74b0a6559c39df0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 25 Apr 2000 14:06:57 +0000 Subject: moved trans2.h and nterr.h into includes.h with all our other includes (This used to be commit d7cd7c88fdabb01d9e40ae8a657737907a21ac37) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e19295834a..b71a5ee3d3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -605,6 +605,8 @@ extern int errno; #include "talloc.h" #include "interfaces.h" #include "hash.h" +#include "trans2.h" +#include "nterr.h" #ifdef HAVE_FNMATCH #include @@ -867,4 +869,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif +extern int DEBUGLEVEL; + #endif /* _INCLUDES_H */ -- cgit From bfb9c3ea86bbd4bef6ab96906fa5eb3fd7ef5c4e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 May 2000 05:42:09 +0000 Subject: allow a DEFAULT_PRINTING to be specified in CFLAGS (This used to be commit 80ebb0ad5499745f988921eceb4584b43ef9aaf1) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b71a5ee3d3..bb5d8192cb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -46,9 +46,13 @@ #endif #ifdef LINUX +#ifndef DEFAULT_PRINTING #define DEFAULT_PRINTING PRINT_BSD +#endif +#ifndef PRINTCAP_NAME #define PRINTCAP_NAME "/etc/printcap" #endif +#endif #ifdef RELIANTUNIX /* -- cgit From 2958dfcdf87d5169fe1152806be6ad03acb04d88 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 8 May 2000 10:42:21 +0000 Subject: added secrets.tdb and changed storage of trust account password to use it (This used to be commit 88ad00b82acc4636ab57dfe710af08ea85b82ff1) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bb5d8192cb..68872f39f0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -611,6 +611,7 @@ extern int errno; #include "hash.h" #include "trans2.h" #include "nterr.h" +#include "secrets.h" #ifdef HAVE_FNMATCH #include -- cgit From c23e01d049cc7aee34e8ac83efeb74c09aa257a2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 9 May 2000 13:28:19 +0000 Subject: the beginnings of a new scheme I've working on to allow an easier head/tng merge. It goes something like this: - headers from tng get copied over one at a time - the old headers get renamed to *_old.h - server side code that used the old headers gets a #define OLD_NTDOMAIN 1 #undef OLD_NTDOMAIN at the start and end of the code - mkproto.awk recognises these special defines and does magic stuff so that each .c file sees the right headers - we start moving the rpc client libraries from tng to head. if this goes OK then, in theory, we should be able to move the client side rpc code from tng to head without disturbing the existing head server side code. Then when that works we can consider merging the server side. it remains to be seen if this scheme will work. So far I've moved rpc_samr.h and don't seem to have broken anything. Note this this is still a very delicate operation, as at every step of the way I want to keep head fully functional. Please don't take part unless you discuss it with me first. (This used to be commit f76c037255a6a79d11bec65e863e009a41a4f0fd) --- source3/include/includes.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 68872f39f0..432fd09f0b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -601,7 +601,7 @@ extern int errno; #define NGROUPS_MAX 32 /* Guess... */ #endif -/* Lists, trees, caching, datbase... */ +/* Lists, trees, caching, database... */ #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" @@ -613,12 +613,6 @@ extern int errno; #include "nterr.h" #include "secrets.h" -#ifdef HAVE_FNMATCH -#include -#else -#include "fnmatch.h" -#endif - #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ @@ -635,7 +629,7 @@ extern int errno; #include "kanji.h" #include "charset.h" -#include "nterr.h" +#include "ntdomain.h" #include "msdfs.h" -- cgit From 8843a6379d7c1cf59f0f3673cbc567b09994b7d2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 11 Jun 2000 05:57:58 +0000 Subject: Linux kernel oplocks now seem to work, but need a _lot_ of testing I had to modify sys_select() to not loop on EINTR. I added a wrapper called sys_select_intr() which gives the old behaviour. (This used to be commit b28cc4163bc2faaa80c5782fc02c8f03c410cdeb) --- source3/include/includes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 432fd09f0b..a30a8448ad 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -868,6 +868,18 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif +#if HAVE_KERNEL_OPLOCKS_LINUX +#ifndef F_SETLEASE +#define F_SETLEASE 1024 +#endif +#ifndef F_GETLEASE +#define F_GETLEASE 1025 +#endif +#ifndef CAP_LEASE +#define CAP_LEASE 28 +#endif +#endif + extern int DEBUGLEVEL; #endif /* _INCLUDES_H */ -- cgit From 0fb1dbe7fa0da5a1374e4a8cb9c3e922c9a08c8d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 11 Jun 2000 06:24:54 +0000 Subject: fixed Linux capabilities handling I used a trick where CAP_LEASE isn't claimed until it is needed. This means we avoid a system call per setreuid(), and never call capset() unless a user tries to get a oplock on a file that they don't own (This used to be commit afa98d511f70f455d599c3a36dd25e49fe74ac09) --- source3/include/includes.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a30a8448ad..432fd09f0b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -868,18 +868,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif -#if HAVE_KERNEL_OPLOCKS_LINUX -#ifndef F_SETLEASE -#define F_SETLEASE 1024 -#endif -#ifndef F_GETLEASE -#define F_GETLEASE 1025 -#endif -#ifndef CAP_LEASE -#define CAP_LEASE 28 -#endif -#endif - extern int DEBUGLEVEL; #endif /* _INCLUDES_H */ -- cgit From f94f053b7618157f6caaa1d65553c1abb3aba917 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 15 Jun 2000 09:35:37 +0000 Subject: added support for kernel level share modes. These are a (small) hack, I suspect we will either get rid of them or do them properly at some stage. (This used to be commit fabe1f350e1fc58db33d22cebd38652950697ced) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 432fd09f0b..a1a04333bf 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -868,6 +868,15 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif +#if HAVE_KERNEL_SHARE_MODES +#ifndef LOCK_MAND +#define LOCK_MAND 32 /* This is a mandatory flock */ +#define LOCK_READ 64 /* ... Which allows concurrent read operations */ +#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ +#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ +#endif +#endif + extern int DEBUGLEVEL; #endif /* _INCLUDES_H */ -- cgit From 159aec63ae916eb641862e4e595df8ce8c51dee8 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 21 Jun 2000 06:26:21 +0000 Subject: A neater way of solving the S_ISSOCK, S_ISFIFO problem. Moved the S_* macros from smb.h to includes.h (This used to be commit b37539e323361239659256ef0837f63b6714ab95) --- source3/include/includes.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a1a04333bf..886fb446cd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -868,6 +868,60 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include #endif +/* Some POSIX definitions for those without */ + +#ifndef S_IFDIR +#define S_IFDIR 0x4000 +#endif +#ifndef S_ISDIR +#define S_ISDIR(mode) ((mode & 0xF000) == S_IFDIR) +#endif +#ifndef S_IRWXU +#define S_IRWXU 00700 /* read, write, execute: owner */ +#endif +#ifndef S_IRUSR +#define S_IRUSR 00400 /* read permission: owner */ +#endif +#ifndef S_IWUSR +#define S_IWUSR 00200 /* write permission: owner */ +#endif +#ifndef S_IXUSR +#define S_IXUSR 00100 /* execute permission: owner */ +#endif +#ifndef S_IRWXG +#define S_IRWXG 00070 /* read, write, execute: group */ +#endif +#ifndef S_IRGRP +#define S_IRGRP 00040 /* read permission: group */ +#endif +#ifndef S_IWGRP +#define S_IWGRP 00020 /* write permission: group */ +#endif +#ifndef S_IXGRP +#define S_IXGRP 00010 /* execute permission: group */ +#endif +#ifndef S_IRWXO +#define S_IRWXO 00007 /* read, write, execute: other */ +#endif +#ifndef S_IROTH +#define S_IROTH 00004 /* read permission: other */ +#endif +#ifndef S_IWOTH +#define S_IWOTH 00002 /* write permission: other */ +#endif +#ifndef S_IXOTH +#define S_IXOTH 00001 /* execute permission: other */ +#endif + +/* Some systems (SCO) treat UNIX domain sockets as FIFOs */ + +#ifndef S_IFSOCK +#define S_IFSOCK S_IFIFO +#endif +#ifndef S_ISSOCK +#define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) +#endif + #if HAVE_KERNEL_SHARE_MODES #ifndef LOCK_MAND #define LOCK_MAND 32 /* This is a mandatory flock */ -- cgit From d2e691280d369ba401b0bdeb9d6ca46c37a5ff65 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 23 Jun 2000 06:19:26 +0000 Subject: Added MAX_SEC_CTX_DEPTH (This used to be commit 2bf21395ba4999d0392d6f54093ddc8861323ddd) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 886fb446cd..1400b2f07e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -933,4 +933,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); extern int DEBUGLEVEL; +#define MAX_SEC_CTX_DEPTH 8 /* Maximum number of security contexts */ + #endif /* _INCLUDES_H */ -- cgit From f1ccd14b424e4edca000850800905d9e7d3a83b7 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 6 Jul 2000 06:59:27 +0000 Subject: Include nss.h if present or define enough values to allow client access to winbind. (This used to be commit 669bd8dc1ab4690cf21310fe0310f1716e4a0197) --- source3/include/includes.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1400b2f07e..4a760b86f5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -935,4 +935,19 @@ extern int DEBUGLEVEL; #define MAX_SEC_CTX_DEPTH 8 /* Maximum number of security contexts */ +#ifdef HAVE_NSS_H +#include +#else + +/* Minimal needed to compile.. */ + +enum nss_status { + NSS_STATUS_SUCCESS, + NSS_STATUS_NOTFOUND, + NSS_STATUS_UNAVAIL +}; + +#endif + #endif /* _INCLUDES_H */ + -- cgit From b561c185972921861946a69b8846681bc7ed3f87 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 10 Jul 2000 06:41:04 +0000 Subject: Fixes for various compile warnings on Solaris 8. (This used to be commit 898a483cdab1ed7d8ff902c0dc0e0620440ae4cd) --- source3/include/includes.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4a760b86f5..4b4d741648 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -671,6 +671,20 @@ typedef struct smb_wpasswd { #define UNI_XDIGIT 0x8 #define UNI_SPACE 0x10 +#ifdef HAVE_NSS_H +#include +#else + +/* Minimal needed to compile.. */ + +enum nss_status { + NSS_STATUS_SUCCESS, + NSS_STATUS_NOTFOUND, + NSS_STATUS_UNAVAIL +}; + +#endif + /***** automatically generated prototypes *****/ #include "proto.h" @@ -935,19 +949,5 @@ extern int DEBUGLEVEL; #define MAX_SEC_CTX_DEPTH 8 /* Maximum number of security contexts */ -#ifdef HAVE_NSS_H -#include -#else - -/* Minimal needed to compile.. */ - -enum nss_status { - NSS_STATUS_SUCCESS, - NSS_STATUS_NOTFOUND, - NSS_STATUS_UNAVAIL -}; - -#endif - #endif /* _INCLUDES_H */ -- cgit From a1bd6766172c91ae93a9c237cbfd8adca60e655c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 18 Jul 2000 05:16:30 +0000 Subject: Fixed some more client SPOOLSS functions. The following functions work now: - spoolenum - spoolopen - spoolgetprinter - spoolgetprinterdriver Items todo: - track down memory bug with spoolenumdata - fix spoolgetprinterdriverdir - fix spoolgetdata - fix display_job_info_ctr in spooljobs All part of the ongoing rpcclient work. Also included a new generic list ADT. Cleaner and simplier than the stuff in util_array.c i think (but then that's why I wrote it). --jerry (This used to be commit 381aba2c9a63faa53728f0520ac316478bc7a1c3) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4b4d741648..eb2f23b6fe 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -612,6 +612,7 @@ extern int errno; #include "trans2.h" #include "nterr.h" #include "secrets.h" +#include "util_list.h" #ifndef UBI_BINTREE_H #include "ubi_Cache.h" -- cgit From 3689e4ffc10fceb4c39814ef58fe31697e7dd976 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Sep 2000 07:02:43 +0000 Subject: the first cut of the internal messaging system. The motivation for this system is to replace the UDP message for oplocks, but this commit only does the "set debug level" message. (This used to be commit 2a34ee95f3929cff131db6c5a2b4820194c05b2d) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index eb2f23b6fe..a18c8b6d5c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -612,6 +612,7 @@ extern int errno; #include "trans2.h" #include "nterr.h" #include "secrets.h" +#include "messages.h" #include "util_list.h" #ifndef UBI_BINTREE_H -- cgit From 3edcc8c407b16d0698117ecc3fd858201c0a80ba Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 29 Sep 2000 04:45:00 +0000 Subject: added a hack to get 64 bit locking working with the broken fcntl() call in glibc 2.1.95. This hack only gets enabled if you define GLIBC_HACK_FCNTL64 (This used to be commit d8b9ec741cc57b5f3dd1b3ef782a7baed402beaa) --- source3/include/includes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a18c8b6d5c..da16ae1632 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -951,5 +951,18 @@ extern int DEBUGLEVEL; #define MAX_SEC_CTX_DEPTH 8 /* Maximum number of security contexts */ + +#ifdef GLIBC_HACK_FCNTL64 +/* this is a gross hack. 64 bit locking is completely screwed up on + i386 Linux in glibc 2.1.95 (which ships with RedHat 7.0). This hack + "fixes" the problem with the current 2.4.0test kernels +*/ +#define fcntl fcntl64 +#undef F_SETLKW +#undef F_SETLK +#define F_SETLK 13 +#define F_SETLKW 14 +#endif + #endif /* _INCLUDES_H */ -- cgit From 636f146abf0a75cd3b21a57b50627ee149a635ab Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 6 Oct 2000 03:21:49 +0000 Subject: Restructuring of vfs layer to include a "this" pointer - can be an fsp or a conn struct depending on the call. We need this to have a clean NT ACL call interface. This will break any existing VFS libraries (that's why this is pre-release code). Andrew gets credit for this one :-) :-). In addition - added Herb's WITH_PROFILE changes - Herb - please examine the changes I've made to the smbd/reply.c code you added. The original code was very ugly and I have replaced it with a START_PROFILE(x)/END_PROFILE(x) pair using the preprocessor. Please check this compiles ok with the --with-profile switch. Jeremy. (This used to be commit b07611f8159b0b3f42e7e02611be9f4d56de96f5) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index da16ae1632..ad2771665a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -637,6 +637,9 @@ extern int errno; #ifdef WITH_PROFILE #include "profile.h" +#else +#define START_PROFILE(x) +#define END_PROFILE(x) #endif #ifndef MAXCODEPAGELINES -- cgit From ba00796e6dd13b87b7988a98e532676d9eab702c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 6 Oct 2000 18:13:52 +0000 Subject: Herb's warning fixes. Also the POSIX locking fix. We now use our own vfs layer to do get/set acl calls (hurrah!). Jeremy. (This used to be commit dfe77c7046cbd65ee52aea7439f21503c1eac41d) --- source3/include/includes.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ad2771665a..da365ab953 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -635,12 +635,7 @@ extern int errno; #include "msdfs.h" -#ifdef WITH_PROFILE #include "profile.h" -#else -#define START_PROFILE(x) -#define END_PROFILE(x) -#endif #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 -- cgit From 01e0d3879ef5de24a6addd0ce00bf3d4de518f7f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 26 Oct 2000 03:31:41 +0000 Subject: TDB password backend support written by Simo Sorce Marked as an experimental compile time option (defaults to off) for now. jerry (This used to be commit 0435af4417b876c2ea1dd4591ae7647784c28e30) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index da365ab953..605932dd21 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -730,7 +730,7 @@ enum nss_status { #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBPWD)) #define USE_SMBPASS_DB 1 #endif -- cgit From 7e4c4721b4fbfa71ce6712ec5b9f3e8e8a105147 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 6 Dec 2000 00:05:15 +0000 Subject: Changed to sourceforge tdb code. This includes spinlocks (so we now have a --with-spinlocks option to configure, this does mean the on-disk tdb format has changed, so 2.2alphaX sites will need to re-create their tdb's. The upside is no more tdb fragmentation and a +5% on netbench. Swings and roundabouts.... Jeremy. (This used to be commit 9dea7b7c257db487f8ced7dad3fce92fba03ea91) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 605932dd21..1102f99d05 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -606,6 +606,7 @@ extern int errno; #include "ubi_dLinkList.h" #include "dlinklist.h" #include "../tdb/tdb.h" +#include "../tdb/spinlock.h" #include "talloc.h" #include "interfaces.h" #include "hash.h" -- cgit From 9c4927d3624c594ea6647d946540ce286a948805 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 18 Mar 2001 13:24:57 +0000 Subject: much better readline support from Simo Sorce, with some mods from me to make it a bit simpler (This used to be commit e1487eb2c4626dbe0cc3b17606eda702cedef28b) --- source3/include/includes.h | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1102f99d05..f2c185e086 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -616,6 +616,8 @@ extern int errno; #include "messages.h" #include "util_list.h" +#include "smb_readline.h" /* SSS: samba readline support */ + #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ @@ -787,24 +789,6 @@ enum nss_status { #define ULTRIX_AUTH 1 #endif -#ifdef HAVE_LIBREADLINE -# ifdef HAVE_READLINE_READLINE_H -# include -# ifdef HAVE_READLINE_HISTORY_H -# include -# endif -# else -# ifdef HAVE_READLINE_H -# include -# ifdef HAVE_HISTORY_H -# include -# endif -# else -# undef HAVE_LIBREADLINE -# endif -# endif -#endif - #ifndef HAVE_STRDUP char *strdup(const char *s); #endif -- cgit From bc25293f96fb559b875d03e6ddbd9079b4af9dff Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 18 Mar 2001 23:41:53 +0000 Subject: much simpler readline code should work with readline 2.x (This used to be commit 7940b6b0cf614ac72266d9e600220c9a9dbd2a43) --- source3/include/includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f2c185e086..f81a5e3362 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -616,8 +616,6 @@ extern int errno; #include "messages.h" #include "util_list.h" -#include "smb_readline.h" /* SSS: samba readline support */ - #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ -- cgit From c7a953a3188ccb6dfbe49ea66304b3d517b0c628 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 19 Mar 2001 07:08:02 +0000 Subject: Added sys_dlopen/sys_dlsym/sys_dlclose. Jeremy. (This used to be commit 49f0e7e7143f82bce9dfd8b06e9e515bc0869ab7) --- source3/include/includes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f81a5e3362..f4dcbde62e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -945,5 +945,18 @@ extern int DEBUGLEVEL; #define F_SETLKW 14 #endif +/* Needed for sys_dlopen/sys_dlsym/sys_dlclose */ +#ifndef RTLD_GLOBAL +#define RTLD_GLOBAL 0 +#endif + +#ifndef RTLD_LAZY +#define RTLD_LAZY 0 +#endif + +#ifndef RTLD_NOW +#define RTLD_NOW 0 +#endif + #endif /* _INCLUDES_H */ -- cgit From 0053bd8b80cc08d65948c97f8ab0b4e2b829f083 Mon Sep 17 00:00:00 2001 From: Jean-François Micouleau Date: Fri, 23 Mar 2001 00:50:31 +0000 Subject: first pass of the new group mapping code J.F. (This used to be commit 7154deb026d53cb0cd503562174c3332a372be63) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f4dcbde62e..93c756a690 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -638,6 +638,8 @@ extern int errno; #include "profile.h" +#include "mapping.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From a6d201a8d7307f8a6342ee131917d6245ab41993 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 3 Apr 2001 00:40:01 +0000 Subject: Added XFS ACLs on Linux. Code from John Trostel . Jeremy. (This used to be commit 0865366f6b1070a8db3d8421c37c8072b36b96e3) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 93c756a690..1c72220d4f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -271,6 +271,10 @@ #include #endif +#ifdef HAVE_XFS_ACLS +#include +#endif + #ifdef HAVE_SYS_FS_S5PARAM_H #include #endif -- cgit From dcc01ec5fb16b3529afef6c13324463db37ad147 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 4 Apr 2001 17:20:57 +0000 Subject: Fix for broken RelientUNIX. Jeremy. (This used to be commit 6808ec0d471d8b436506bbd7b9db67c28832be76) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1c72220d4f..325880fad9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -57,7 +57,7 @@ #ifdef RELIANTUNIX /* * has to be included before any other to get - * large file support on Reliant UNIX + * large file support on Reliant UNIX. Yes, it's broken :-). */ #ifdef HAVE_UNISTD_H #include -- cgit From 0766f84a403354c46398690e69c138a27344aece Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 18 Apr 2001 04:33:24 +0000 Subject: Merge of changes from 2.2. Jeremy. (This used to be commit df912162bbe93611c80defe830641f580687edbb) --- source3/include/includes.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 325880fad9..f27d2f564f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -497,8 +497,10 @@ #ifdef LARGE_SMB_OFF_T #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32)) #else #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0)) #endif /* @@ -793,6 +795,24 @@ enum nss_status { #define ULTRIX_AUTH 1 #endif +#ifdef HAVE_LIBREADLINE +# ifdef HAVE_READLINE_READLINE_H +# include +# ifdef HAVE_READLINE_HISTORY_H +# include +# endif +# else +# ifdef HAVE_READLINE_H +# include +# ifdef HAVE_HISTORY_H +# include +# endif +# else +# undef HAVE_LIBREADLINE +# endif +# endif +#endif + #ifndef HAVE_STRDUP char *strdup(const char *s); #endif @@ -916,6 +936,16 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define S_IXOTH 00001 /* execute permission: other */ #endif +/* NetBSD doesn't have these */ +#ifndef SHM_R +#define SHM_R 0400 +#endif + +#ifndef SHM_W +#define SHM_W 0200 +#endif + + /* Some systems (SCO) treat UNIX domain sockets as FIFOs */ #ifndef S_IFSOCK -- cgit From d095b5249cf9e1496ad5a3d6b5acb77af2c587a7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 28 Apr 2001 13:49:34 +0000 Subject: - added test for vasprintf - cleaned up GNUC printf attribute macros - added enum handling in mkproto - removed non-vararg code - made slprintf and vslprintf just macros for snprintf and vsnprintf - don't need slprintf code any more (This used to be commit c7aeb2254dfc3cd0aa0b6c0bdd426f9323be0ddf) --- source3/include/includes.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f27d2f564f..a5fa555058 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -994,5 +994,20 @@ extern int DEBUGLEVEL; #define RTLD_NOW 0 #endif +/* add varargs prototypes with printf checking */ +#ifdef __GNUC__ +#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) +#else +#define PRINTF_ATTRIBUTE(a1, a2) +#endif + +int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3); +#ifndef HAVE_SNPRINTF +int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); +#endif +#ifndef HAVE_ASPRINTF +int asprintf(char **,char *, ...) PRINTF_ATTRIBUTE(2,3); +#endif + #endif /* _INCLUDES_H */ -- cgit From 63602d15afe96206e1fdcea4d2b9014582aa41aa Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 28 Apr 2001 14:01:02 +0000 Subject: - fixed some compiler warnings - fixed slprintf and vsprintf macros (This used to be commit c986a3c51e8cdbc1230edbe0f4a91138c4ada29d) --- source3/include/includes.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a5fa555058..e2edb512ae 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -54,6 +54,13 @@ #endif #endif +/* use gcc attribute to check printf fns */ +#ifdef __GNUC__ +#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) +#else +#define PRINTF_ATTRIBUTE(a1, a2) +#endif + #ifdef RELIANTUNIX /* * has to be included before any other to get @@ -995,12 +1002,6 @@ extern int DEBUGLEVEL; #endif /* add varargs prototypes with printf checking */ -#ifdef __GNUC__ -#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) -#else -#define PRINTF_ATTRIBUTE(a1, a2) -#endif - int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3); #ifndef HAVE_SNPRINTF int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); @@ -1009,5 +1010,10 @@ int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); int asprintf(char **,char *, ...) PRINTF_ATTRIBUTE(2,3); #endif +/* we used to use these fns, but now we have good replacements + for snprintf and vsnprintf */ +#define slprintf snprintf +#define vslprintf vsnprintf + #endif /* _INCLUDES_H */ -- cgit From 548d16869acffdec899121906a7bcd88f58d9b6f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 3 May 2001 19:47:30 +0000 Subject: Fixed SHM_R/SHM_W warnings by moving sys/ipc.h and sys/shm.h into includes.h and using autoconf tests. Added "restrict acl with mask" parameter. Jeremy. (This used to be commit 7792e32ba7fd734cc68b354f31c382ac11521fe8) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e2edb512ae..5988393588 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -357,6 +357,14 @@ #endif #endif /* HAVE_NETGROUP */ +#if defined(HAVE_SYS_IPC_H) +#include +#endif /* HAVE_SYS_IPC_H */ + +#if defined(HAVE_SYS_SHM_H) +#include +#endif /* HAVE_SYS_SHM_H */ + /* * Define VOLATILE if needed. */ -- cgit From ae6e20300ce125a7922d2434520c439877a90881 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 8 May 2001 05:53:33 +0000 Subject: Removed S_ISSOCK() macro as it's only used within winbind client code. (This used to be commit 8fe76adb33bb7de19c8b2c8783dc6e3a3977bd8f) --- source3/include/includes.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5988393588..9097d47652 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -960,16 +960,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define SHM_W 0200 #endif - -/* Some systems (SCO) treat UNIX domain sockets as FIFOs */ - -#ifndef S_IFSOCK -#define S_IFSOCK S_IFIFO -#endif -#ifndef S_ISSOCK -#define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) -#endif - #if HAVE_KERNEL_SHARE_MODES #ifndef LOCK_MAND #define LOCK_MAND 32 /* This is a mandatory flock */ -- cgit From bbf5ea221aad91a99564ee130a6334d3b25e2a9a Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 29 May 2001 07:34:01 +0000 Subject: 4 new functions to retrieve single linked list of group and passwd entries + a fix to an infinite loop in srv_samr_nt.c caused by misuse of setgrent/getgrent/endgrent solved by these new functions (This used to be commit 97dbb54a13e2285f1905ee1ec9aafeebdaee8917) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9097d47652..9137799064 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -637,6 +637,8 @@ extern int errno; #include "messages.h" #include "util_list.h" +#include "util_getent.h" + #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ -- cgit From 05d08414728313e2ca04cd5ccbd3ce9d3470a0a3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 30 May 2001 12:28:13 +0000 Subject: - added AC_HAVE_DECL() macro to aclocal.m4, so we can easily add tests for a fn or variable being defined in headers - used this to add prototypes for asprintf and vasprintf on systems that don't have them (This used to be commit ab2465239414853a14529f88a25f13c392aa2d3f) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9137799064..e30831ac80 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -865,6 +865,12 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid); #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESGID_DECL)) int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif +#ifndef HAVE_ASPRINTF_DECL +int asprintf(char **ptr, const char *format, ...); +#endif +#ifndef HAVE_VASPRINTF_DECL +int vasprintf(char **ptr, const char *format, va_list ap); +#endif #if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) #define bzero(a,b) memset((a),'\0',(b)) -- cgit From d8f2016d4a3c78c5e5c060b831442018bcd50ff2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 30 May 2001 13:53:20 +0000 Subject: fixed asprintf declaration (This used to be commit fbf03c89e6b1980f4f75a657f9760edb7445d8cb) --- source3/include/includes.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e30831ac80..e7d983064f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -865,9 +865,6 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid); #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESGID_DECL)) int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif -#ifndef HAVE_ASPRINTF_DECL -int asprintf(char **ptr, const char *format, ...); -#endif #ifndef HAVE_VASPRINTF_DECL int vasprintf(char **ptr, const char *format, va_list ap); #endif @@ -1009,11 +1006,11 @@ extern int DEBUGLEVEL; /* add varargs prototypes with printf checking */ int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3); -#ifndef HAVE_SNPRINTF +#ifndef HAVE_SNPRINTF_DECL int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); #endif -#ifndef HAVE_ASPRINTF -int asprintf(char **,char *, ...) PRINTF_ATTRIBUTE(2,3); +#ifndef HAVE_ASPRINTF_DECL +int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif /* we used to use these fns, but now we have good replacements -- cgit From 384a328457676f1ece408fd0dca0a4c6954da872 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 4 Jun 2001 03:15:41 +0000 Subject: Compile fix for Solaris. (This used to be commit 7a1929b6caeb9b349510f7f4ae394246b9c5adc3) --- source3/include/includes.h | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e7d983064f..50d1e4d72d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -697,17 +697,38 @@ typedef struct smb_wpasswd { #define UNI_XDIGIT 0x8 #define UNI_SPACE 0x10 -#ifdef HAVE_NSS_H +#ifdef HAVE_NSS_COMMON_H + +/* Sun Solaris */ + +#include +#include +#include + +typedef nss_status_t NSS_STATUS; + +#define NSS_STATUS_SUCCESS NSS_SUCCESS +#define NSS_STATUS_NOTFOUND NSS_NOTFOUND +#define NSS_STATUS_UNAVAIL NSS_UNAVAIL +#define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN + +#elif HAVE_NSS_H + +/* GNU */ + #include -#else -/* Minimal needed to compile.. */ +typedef enum nss_status NSS_STATUS; + +#else /* Nothing's defined. Neither gnu nor sun */ -enum nss_status { - NSS_STATUS_SUCCESS, - NSS_STATUS_NOTFOUND, - NSS_STATUS_UNAVAIL -}; +typedef enum +{ + NSS_STATUS_SUCCESS, + NSS_STATUS_NOTFOUND, + NSS_STATUS_UNAVAIL, + NSS_STATUS_TRYAGAIN +} NSS_STATUS; #endif -- cgit From 809c0258780cc75cd456518571891fc30998d30d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 18 Jun 2001 20:27:35 +0000 Subject: Added patches to remove Linux specific XFS ACLs. These are now handled by the generic Linux ACL code. rpc_server/srv_samr_nt.c: Don't delete a policy handle before it's created. Jeremy. (This used to be commit db5b82e53a7061c4764d39ceb3df82e706aad42f) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 50d1e4d72d..899c9f3a42 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -278,10 +278,6 @@ #include #endif -#ifdef HAVE_XFS_ACLS -#include -#endif - #ifdef HAVE_SYS_FS_S5PARAM_H #include #endif -- cgit From b95a294a0879e800e816281a80d0074224cd8cd4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 25 Jun 2001 02:53:13 +0000 Subject: fixed usage of socklen_t and also tidied up SIG_ATOMIC_T, using a typedef instead of a define (This used to be commit e2ecff419fdc0a0dc7551b33b377dc11061ef2a3) --- source3/include/includes.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 899c9f3a42..32f8429345 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -372,15 +372,17 @@ #endif /* - * Define SIG_ATOMIC_T if needed. + * Define additional missing types */ +#ifndef HAVE_SIG_ATOMIC_T_TYPE +typedef int sig_atomic_t; +#endif -#if defined(HAVE_SIG_ATOMIC_T_TYPE) -#define SIG_ATOMIC_T sig_atomic_t -#else -#define SIG_ATOMIC_T int +#ifndef HAVE_SOCKLEN_T_TYPE +typedef int socklen_t; #endif + #ifndef uchar #define uchar unsigned char #endif -- cgit From 8a0480b137a6bf8d0ddce4d7dc1dd87c223af14f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 26 Jun 2001 05:21:49 +0000 Subject: fall back to "unsigned" for uint32 on systems that don't have one (This used to be commit 4d0c3167099f461b46fafaa3a35b14babbadcb93) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 32f8429345..b801e1408c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -449,7 +449,9 @@ typedef int socklen_t; #define uint32 unsigned long #elif (SIZEOF_SHORT == 4) #define uint32 unsigned short -#endif +#else +/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ +#define uint32 unsigned #endif /* -- cgit From f73122e79dba729982ede928e8b026ffff526b0a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 26 Jun 2001 05:38:24 +0000 Subject: fixed build don't rush commits :) (This used to be commit 442bf5cc9e6de7888f9a8cc06050f73ef880c4d9) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b801e1408c..96688c5217 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -453,6 +453,7 @@ typedef int socklen_t; /* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ #define uint32 unsigned #endif +#endif /* * Types for devices, inodes and offsets. -- cgit From 1b5af57b2f6a03d67d99a718ddac2b4830bd13cd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 3 Jul 2001 18:33:16 +0000 Subject: Added #define of int32 to int for cray. This will almost certainly cause the rpc code to fail on the cray.... Jeremy. (This used to be commit 33a299a0c42bb7090e2030fb1e5cafdf07346bc6) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 96688c5217..c5f4720a5a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -434,6 +434,9 @@ typedef int socklen_t; #define int32 long #elif (SIZEOF_SHORT == 4) #define int32 short +#else +/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ +#define uint32 int #endif #endif -- cgit From 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 4 Jul 2001 07:15:53 +0000 Subject: The big character set handling changeover! This commit gets rid of all our old codepage handling and replaces it with iconv. All internal strings in Samba are now in "unix" charset, which may be multi-byte. See internals.doc and my posting to samba-technical for a more complete explanation. (This used to be commit debb471267960e56005a741817ebd227ecfc512a) --- source3/include/includes.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c5f4720a5a..9ed7401df3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -361,6 +361,10 @@ #include #endif /* HAVE_SYS_SHM_H */ +#ifdef HAVE_NATIVE_ICONV +#include +#endif + /* * Define VOLATILE if needed. */ @@ -656,9 +660,6 @@ extern int errno; #include "byteorder.h" -#include "kanji.h" -#include "charset.h" - #include "ntdomain.h" #include "msdfs.h" @@ -1016,6 +1017,7 @@ extern int DEBUGLEVEL; #define F_SETLKW 14 #endif + /* Needed for sys_dlopen/sys_dlsym/sys_dlclose */ #ifndef RTLD_GLOBAL #define RTLD_GLOBAL 0 -- cgit From 5a2b87d810da14d392ff44cab439773dccce43e8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 4 Jul 2001 07:39:01 +0000 Subject: missed a couple of strchr calls (This used to be commit 57e7df8ae58020ab653307c1fdfbadd44983e900) --- source3/include/includes.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9ed7401df3..7c1a4a8607 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -611,11 +611,6 @@ extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] #endif -#ifndef HAVE_STRCHR -# define strchr index -# define strrchr rindex -#endif - #ifndef HAVE_ERRNO_DECL extern int errno; #endif -- cgit From 7be19ad10fc30fab199653facd11496170219e1b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 7 Jul 2001 07:00:15 +0000 Subject: Add backend encryption support for NTLMv2. The leg-work for this was done by the folks at samba-tng.org, I'm just bringing it accross to HEAD. The MD5 implementation is seperatly derived, and does not have the copyright problems that the one in TNG has. Also add const to a few places where it makes sence. Andrew Bartlett (This used to be commit 8df8e841445dfe09fc7a06bb55d12adc3fecb345) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7c1a4a8607..3d6147f587 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -663,6 +663,9 @@ extern int errno; #include "mapping.h" +#include "md5.h" +#include "hmacmd5.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From 49514266131aa55b4a97f02b39b2d5e5c1f625a2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 22 Jul 2001 07:38:32 +0000 Subject: changed the iconv interface to go via ucs2 for all conversions. This fixes some problems wih some character sets and allows for using internal charsets in conjunction with ionv charsets this makes us slower but more correct. speed will come later. (This used to be commit 594f84b4e39182dcf344c02dc0185376a2726395) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3d6147f587..51f2ca9ee8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1029,6 +1029,11 @@ extern int DEBUGLEVEL; #define RTLD_NOW 0 #endif +/* needed for some systems without iconv */ +#ifndef EILSEQ +#define EILSEQ EINVAL +#endif + /* add varargs prototypes with printf checking */ int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3); #ifndef HAVE_SNPRINTF_DECL -- cgit From 5f1130746f2d519cabacd3059528148916dc554d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 22 Jul 2001 10:50:21 +0000 Subject: if EILSEQ doesn't exist then use EIO. It doesn't really matter what error code we use, as long as its not another one that iconv() can give. (This used to be commit 2097abb76c1845a69a7136af388cef09243ca066) --- source3/include/includes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 51f2ca9ee8..87547f5253 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1029,9 +1029,10 @@ extern int DEBUGLEVEL; #define RTLD_NOW 0 #endif -/* needed for some systems without iconv */ +/* needed for some systems without iconv. Doesn't really matter + what error code we use */ #ifndef EILSEQ -#define EILSEQ EINVAL +#define EILSEQ EIO #endif /* add varargs prototypes with printf checking */ -- cgit From 7879d999ab59678e98b7385e88eda5cce2c2a9fd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 25 Jul 2001 03:28:45 +0000 Subject: a better test for unix domain sockets (This used to be commit 7b3d030e1f869a842822d9a356a027cca6f3a725) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 87547f5253..2caeb255bd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -107,7 +107,7 @@ #include #endif -#ifdef HAVE_SYS_UN_H +#ifdef HAVE_UNIXSOCKET #include #endif -- cgit From 986372901e85a79343ba32f590a4a3e7658d2565 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 3 Aug 2001 13:09:23 +0000 Subject: This is my 'Authentication Rewrite' version 1.01, mostly as submitted to samba-technical a few weeks ago. The idea here is to standardize the checking of user names and passwords, thereby ensuring that all authtentications pass the same standards. The interface currently implemented in as nt_status = check_password(user_info, server_info) where user_info contains (mostly) the authentication data, and server_info contains things like the user-id they got, and their resolved user name. The current ugliness with the way the structures are created will be killed the next revision, when they will be created and malloced by creator functions. This patch also includes the first implementation of NTLMv2 in HEAD, but which needs some more testing. We also add a hack to allow plaintext passwords to be compared with smbpasswd, not the system password database. Finally, this patch probably reintroduces the PAM accounts bug we had in 2.2.0, I'll fix that once this hits the tree. (I've just finished testing it on a wide variety of platforms, so I want to get this patch in). (This used to be commit b30b6202f31d339b48d51c0d38174cafd1cfcd42) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2caeb255bd..63bcb1192e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -666,6 +666,8 @@ extern int errno; #include "md5.h" #include "hmacmd5.h" +#include "auth.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From 2051bb7d0366e07c5ecda5e5f7cfedc4153d6228 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 22 Aug 2001 19:11:55 +0000 Subject: A few changes: drop paramaters: status utmp hostname change session code to always record each vuid current on the server. The sessionid struct is no longer packed, as I couldn't get that to work ;-) change smbstatus to show this info and less of the connections.tdb info (its not actualy that accurate). I'll get swat doing some of this shortly. (This used to be commit b068ad300527c44673bbee0aede7849199c89de7) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 63bcb1192e..8b138030ef 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -668,6 +668,8 @@ extern int errno; #include "auth.h" +#include "session.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From d1f53e404496dff10df7dc5e5b58ed676982c955 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 23 Aug 2001 19:06:20 +0000 Subject: Fixed detection of CUPS. We need to check for the presence of the cups header files as well as libcups. (This used to be commit 2dbb41a7b88e7fad63579111aaab4a1cd28c54d5) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b138030ef..bf82469aa3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -760,7 +760,7 @@ typedef enum #endif #ifndef DEFAULT_PRINTING -#ifdef HAVE_LIBCUPS +#ifdef HAVE_CUPS #define DEFAULT_PRINTING PRINT_CUPS #define PRINTCAP_NAME "cups" #elif defined(SYSV) -- cgit From 7deed93dd7c451b71d9b3cd801a265dbe8e664fc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 5 Sep 2001 07:55:54 +0000 Subject: fixed a bunch of compilation errors on Solaris, mostly people getting NSS_STATUS and WINBINDD error codes mixed up (This used to be commit 66698d6b841df809a8654012a8385bffacb9dc4a) --- source3/include/includes.h | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bf82469aa3..ad1633fb87 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -704,40 +704,7 @@ typedef struct smb_wpasswd { #define UNI_XDIGIT 0x8 #define UNI_SPACE 0x10 -#ifdef HAVE_NSS_COMMON_H - -/* Sun Solaris */ - -#include -#include -#include - -typedef nss_status_t NSS_STATUS; - -#define NSS_STATUS_SUCCESS NSS_SUCCESS -#define NSS_STATUS_NOTFOUND NSS_NOTFOUND -#define NSS_STATUS_UNAVAIL NSS_UNAVAIL -#define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN - -#elif HAVE_NSS_H - -/* GNU */ - -#include - -typedef enum nss_status NSS_STATUS; - -#else /* Nothing's defined. Neither gnu nor sun */ - -typedef enum -{ - NSS_STATUS_SUCCESS, - NSS_STATUS_NOTFOUND, - NSS_STATUS_UNAVAIL, - NSS_STATUS_TRYAGAIN -} NSS_STATUS; - -#endif +#include "nsswitch/nss.h" /***** automatically generated prototypes *****/ #include "proto.h" -- cgit From 5573a1c7394362f5e46c58b8cfaf6bf7a080c391 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Sep 2001 14:14:57 +0000 Subject: added "display charset" option in smb.conf, along with d_printf() which should now be used instead of DEBUG(0) or printf() for interactive messages I have only converted client.c to use d_printf(), and the code hasn't had much testing yet. Eventually we want all interactive code to use d_printf(), plus SWAT (This used to be commit 266d8e67669adb329f25676c4bc4d4c50f223428) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ad1633fb87..b29759540f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -639,6 +639,7 @@ extern int errno; #include "secrets.h" #include "messages.h" #include "util_list.h" +#include "charset.h" #include "util_getent.h" -- cgit From 65c5a1c0ba2cc3dc8e45a499c42191016e658b20 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Sep 2001 02:59:23 +0000 Subject: convert more code to using d_printf (This used to be commit 60d297303488ed583537ca2853828fccd6da2ade) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b29759540f..98580c3626 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1009,6 +1009,8 @@ extern int DEBUGLEVEL; /* add varargs prototypes with printf checking */ int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3); +int d_printf(char *, ...) PRINTF_ATTRIBUTE(1,2); +int d_fprintf(FILE *f, char *, ...) PRINTF_ATTRIBUTE(2,3); #ifndef HAVE_SNPRINTF_DECL int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); #endif -- cgit From eb7b28759a71b8a1356a8706fa194179f3309990 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 9 Sep 2001 02:37:10 +0000 Subject: fixed missing const on d_printf declaration (This used to be commit 865e0507e6e6ad6a71d833c4f2a0f57362637719) --- source3/include/includes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 98580c3626..df0448bb9c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1008,9 +1008,9 @@ extern int DEBUGLEVEL; #endif /* add varargs prototypes with printf checking */ -int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3); -int d_printf(char *, ...) PRINTF_ATTRIBUTE(1,2); -int d_fprintf(FILE *f, char *, ...) PRINTF_ATTRIBUTE(2,3); +int fdprintf(int , const char *, ...) PRINTF_ATTRIBUTE(2,3); +int d_printf(const char *, ...) PRINTF_ATTRIBUTE(1,2); +int d_fprintf(FILE *f, const char *, ...) PRINTF_ATTRIBUTE(2,3); #ifndef HAVE_SNPRINTF_DECL int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); #endif -- cgit From b30e75692d68233448b3ad3d7ddd4b4ac423d3ab Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 10 Sep 2001 11:08:57 +0000 Subject: replaced stdio in many parts of samba with a XFILE. XFILE is a cut-down replacemnt of stdio that doesn't suffer from the 8-bit filedescriptor limit that we hit with nasty consequences on some systems I would eventually prefer us to have a configure test to see if we need to replace stdio, but for now this code needs to be tested widely so I'm enabling it by default. (This used to be commit 1af8bf34f1caa3e7ec312d8109c07d32a945a448) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index df0448bb9c..1f97a2d7ed 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -640,6 +640,7 @@ extern int errno; #include "messages.h" #include "util_list.h" #include "charset.h" +#include "xfile.h" #include "util_getent.h" -- cgit From b12a4dd9b655485420d5c67dd143d8f49ac28a40 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 10 Sep 2001 12:14:18 +0000 Subject: declare dbf in one spot (This used to be commit f41c3bb80f1e498a9d27f6e236b0ff3a742764c9) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1f97a2d7ed..8cb587209c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -626,6 +626,7 @@ extern int errno; #endif /* Lists, trees, caching, database... */ +#include "xfile.h" #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" @@ -640,7 +641,6 @@ extern int errno; #include "messages.h" #include "util_list.h" #include "charset.h" -#include "xfile.h" #include "util_getent.h" -- cgit From 36a6611da2820da3635a8158dd26f41732b5b4fd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 18 Sep 2001 06:20:28 +0000 Subject: Use structure copy to fix unaligned accesses on 64bit architectures on Linux. Jeremy. (This used to be commit b4b891279b6292237113456f1bb0d4393f1f9af1) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8cb587209c..9b56c8a477 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -753,7 +753,7 @@ typedef struct smb_wpasswd { #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBPWD)) +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBSAM)) #define USE_SMBPASS_DB 1 #endif -- cgit From 81f56139b6964ddbe2c03232475f87f474136490 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 11 Oct 2001 07:42:52 +0000 Subject: initial kerberos/ADS/SPNEGO support in libsmb and smbclient. To activate you need to: - install krb5 libraries - run configure - build smbclient - run kinit to get a TGT - run smbclient with the -k option to choose kerberos auth (This used to be commit d33057585644e1337bac743e25ed7653bfb39eef) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9b56c8a477..a268519488 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -661,7 +661,7 @@ extern int errno; #include "msdfs.h" -#include "profile.h" +#include "smbprofile.h" #include "mapping.h" @@ -672,6 +672,8 @@ extern int errno; #include "session.h" +#include "asn1.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From a689b24db14436ab1faa2f2f79b9f27b777b1fdb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 14 Oct 2001 12:10:29 +0000 Subject: the next step in the intl changeover. This should get us compiling agian, and also completes the switch to lang_tdb.c. SWAT should now work with a po file in the lib/ directory also removed useless SYSLOG defines in many files (This used to be commit 5296b20ad85d7519c870768455cb4d8df048c55a) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a268519488..3a6282a006 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -627,6 +627,7 @@ extern int errno; /* Lists, trees, caching, database... */ #include "xfile.h" +#include "intl.h" #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" -- cgit From 5ad7448359c7bc1d3b1579f105b7324290bf21ec Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 18 Oct 2001 10:26:06 +0000 Subject: the beginnings of kerberos support in smbd. It doesn't work yet, but it should give something for others to hack on and possibly find what I'm doing wrong. (This used to be commit 353c290f059347265b9be2aa1010c2956da06485) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3a6282a006..38692d9906 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -365,6 +365,10 @@ #include #endif +#if HAVE_KRB5 +#include +#endif + /* * Define VOLATILE if needed. */ -- cgit From b24ceaa83732cb29c88c30531ef0790f6c5c25b8 Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Fri, 19 Oct 2001 16:46:34 +0000 Subject: Add rap.h for net utility and libsmb (This used to be commit 3545de4773438f859e64b3578c2bbf706257eced) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 38692d9906..33e50ab4ea 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -670,6 +670,8 @@ extern int errno; #include "mapping.h" +#include "rap.h" + #include "md5.h" #include "hmacmd5.h" -- cgit From be6edf50c4e76662cd80eab9d60182f2e4f02d24 Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Tue, 23 Oct 2001 14:16:22 +0000 Subject: Add popt for parsing commandline options (This used to be commit df34e11d84a6fe89dc6654eb10de0a49383e1dea) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 33e50ab4ea..7362aace9b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -681,6 +681,8 @@ extern int errno; #include "asn1.h" +#include "popt.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From db8ff475aca6eaed303300de24d187b9476b7c7b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sun, 4 Nov 2001 20:50:30 +0000 Subject: Fix for broken-as-shipped RedHat 7.2 system headers. Now we have to detect this in configure. Jeremy. (This used to be commit 44fb1992c98e7cca5663b17ea9a4833fcf0a8478) --- source3/include/includes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7362aace9b..89ab1b50a4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -327,7 +327,19 @@ #endif #ifdef HAVE_SYS_CAPABILITY_H + +#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) +#define _I386_STATFS_H +#define BROKEN_REDHAT_7_STATFS_WORKAROUND +#endif + #include + +#ifdef BROKEN_REDHAT_7_STATFS_WORKAROUND +#undef _I386_STATFS_H +#undef BROKEN_REDHAT_7_STATFS_WORKAROUND +#endif + #endif #if defined(HAVE_RPC_RPC_H) -- cgit From 186726b7f85f3e84c9ad900262da93471570498e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 15 Nov 2001 21:06:41 +0000 Subject: Tidyups and things I discovered during the merge... Jeremy. (This used to be commit 9c8439f25b90d80adcd7161bfed3664af6256940) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 89ab1b50a4..fde3fc30f2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -776,7 +776,7 @@ typedef struct smb_wpasswd { #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBSAM)) +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) #define USE_SMBPASS_DB 1 #endif -- cgit From f741f656737f4ec46cd318e986b6bf412ed309d2 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 19 Nov 2001 02:49:53 +0000 Subject: Store some path names in global variables initialized to configure default, rather than in preprocessor macros. (This used to be commit 79ec88f0da40faebe1e587f1b3e87b5f2b184f58) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fde3fc30f2..4acd340abd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -658,6 +658,7 @@ extern int errno; #include "messages.h" #include "util_list.h" #include "charset.h" +#include "dynconfig.h" #include "util_getent.h" -- cgit From 1ba477ae6c8c4c240996d2fd9b8b0c43ee861939 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 19 Nov 2001 04:29:24 +0000 Subject: Fix obvious typo. (This used to be commit d761a3860ba7b11b446d3a9865ddfeff8e2f658d) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4acd340abd..17c95eb6f7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -456,7 +456,7 @@ typedef int socklen_t; #define int32 short #else /* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ -#define uint32 int +#define int32 int #endif #endif -- cgit From 6464bb0ae5d2cb774ccd5187f65a6ff83c051ed9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 20 Nov 2001 08:54:15 +0000 Subject: added the beginnings of ADS support in smbd (This used to be commit c7f611691941ca92f57665e19d6e46b161599427) --- source3/include/includes.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 17c95eb6f7..8b61bc573c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -381,6 +381,19 @@ #include #endif +#if HAVE_LDAP +#include +#endif + +#if HAVE_SASL_H +#include +#endif + +/* we support ADS if we have krb5 and ldap libs */ +#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_SASL_H) +#define HAVE_ADS +#endif + /* * Define VOLATILE if needed. */ @@ -650,6 +663,7 @@ extern int errno; #include "../tdb/tdb.h" #include "../tdb/spinlock.h" #include "talloc.h" +#include "ads.h" #include "interfaces.h" #include "hash.h" #include "trans2.h" @@ -871,6 +885,14 @@ int rename(const char *zfrom, const char *zto); time_t mktime(struct tm *t); #endif +#ifndef HAVE_STRLCPY +size_t strlcpy(char *d, const char *s, size_t bufsize); +#endif + +#ifndef HAVE_STRLCAT +size_t strlcat(char *d, const char *s, size_t bufsize); +#endif + #ifndef HAVE_FTRUNCATE int ftruncate(int f,long l); #endif -- cgit From ad2974cd05b4d08c8b92f505bf95aa8e8533235f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 24 Nov 2001 14:16:41 +0000 Subject: added "net join" command this completes the first stage of the smbd ADS support (This used to be commit 058a5aee901e6609969ef7e1d482a720a84a4a12) --- source3/include/includes.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b61bc573c..adae49ddea 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -737,6 +737,13 @@ typedef struct smb_wpasswd { wpstring pw_shell; } SMB_STRUCT_WPASSWD; +/* used in net.c */ +struct functable { + char *funcname; + int (*fn)(); +}; + + /* Defines for wisXXX functions. */ #define UNI_UPPER 0x1 #define UNI_LOWER 0x2 -- cgit From 0b5f228d30718801c2b9b1a6da455a5b4e6a7815 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 25 Nov 2001 12:40:23 +0000 Subject: added HAVE_LDAP_H check (This used to be commit a1304be045d9cfd7bb793bb55ff49e158440a90e) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index adae49ddea..27deaf4339 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -381,7 +381,7 @@ #include #endif -#if HAVE_LDAP +#if HAVE_LDAP_H #include #endif @@ -390,7 +390,7 @@ #endif /* we support ADS if we have krb5 and ldap libs */ -#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_SASL_H) +#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_LDAP_H) && defined(HAVE_SASL_H) #define HAVE_ADS #endif -- cgit From 4e512ab75d33b0801b549de50010131166f1e93a Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sun, 25 Nov 2001 23:33:15 +0000 Subject: Fixed compiler warning. Why do people keep adding stuff to includes.h (OK I am guilty of this too)? It's getting really huge and full of random junk. )-: I've noticed TNG have started to split stuff up in to individual header files included as needed. (This used to be commit 36630f3984cb2bc4e60d910889e0396891cbc088) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 27deaf4339..f0ab1a2c21 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -740,7 +740,7 @@ typedef struct smb_wpasswd { /* used in net.c */ struct functable { char *funcname; - int (*fn)(); + int (*fn)(int argc, const char **argv); }; -- cgit From b1cf8f6cdafe1e9f6c2140617d42178bf5d4cf24 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 27 Nov 2001 07:09:06 +0000 Subject: sigh. some systems have libkrb5 but not krb5.h (This used to be commit 4b89fdecfcf384e7434470a9dcc963f9d96498d1) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f0ab1a2c21..0a3fd1f4c0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -377,7 +377,7 @@ #include #endif -#if HAVE_KRB5 +#if HAVE_KRB5_H #include #endif @@ -390,7 +390,7 @@ #endif /* we support ADS if we have krb5 and ldap libs */ -#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_LDAP_H) && defined(HAVE_SASL_H) +#if defined(HAVE_KRB5) && defined(HAVE_KRB5_H) && defined(HAVE_LDAP) && defined(HAVE_LDAP_H) && defined(HAVE_SASL_H) #define HAVE_ADS #endif -- cgit From a7ac992b12325c9771ef9baa5543c1e7ac2121d4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 27 Nov 2001 22:37:25 +0000 Subject: added test for krb5.h this was causing the kerberos stuff to fail compilation on several platforms (This used to be commit 17e2f3897374c76dd66b21fdcd93c3a04671f4ce) --- source3/include/includes.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0a3fd1f4c0..0ebc09b450 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -379,18 +379,25 @@ #if HAVE_KRB5_H #include +#else +#undef HAVE_KRB5 #endif #if HAVE_LDAP_H #include +#else +#undef HAVE_LDAP #endif #if HAVE_SASL_H #include +#else +/* we must have sasl to use ldap */ +#undef HAVE_LDAP #endif /* we support ADS if we have krb5 and ldap libs */ -#if defined(HAVE_KRB5) && defined(HAVE_KRB5_H) && defined(HAVE_LDAP) && defined(HAVE_LDAP_H) && defined(HAVE_SASL_H) +#if defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS #endif -- cgit From 5d378a280f74405fccbadbfb28e1066613c76fd8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Dec 2001 11:18:56 +0000 Subject: added internal sasl/gssapi code. This means we are no longer dependent on cyrus-sasl which makes the code much less fragile. Also added code to auto-determine the server name or realm (This used to be commit 435fdf276a79c2a517adcd7726933aeef3fa924b) --- source3/include/includes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0ebc09b450..6a44bf7aa8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -389,11 +389,11 @@ #undef HAVE_LDAP #endif -#if HAVE_SASL_H -#include +#if HAVE_GSSAPI_GSSAPI_H +#include +#include #else -/* we must have sasl to use ldap */ -#undef HAVE_LDAP +#undef HAVE_KRB5 #endif /* we support ADS if we have krb5 and ldap libs */ -- cgit From 09b01cdcbd7d3400bf88950684b17f9228595700 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Dec 2001 12:06:08 +0000 Subject: check for gssapi_generic.h (This used to be commit 838fbac7a086ff82498c3f0ba95b714123a7428c) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6a44bf7aa8..ec4628e51f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -391,6 +391,11 @@ #if HAVE_GSSAPI_GSSAPI_H #include +#else +#undef HAVE_KRB5 +#endif + +#if HAVE_GSSAPI_GSSAPI_GENERIC_H #include #else #undef HAVE_KRB5 -- cgit From 55f6eefe12d4864724fc4cb0584ef1426e27ff7b Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 19 Dec 2001 04:55:58 +0000 Subject: Doc. (This used to be commit 5b6c22a209a26cb9adbf6d7733d396038c729633) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ec4628e51f..3b2b1db877 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -54,8 +54,10 @@ #endif #endif -/* use gcc attribute to check printf fns */ #ifdef __GNUC__ +/** Use gcc attribute to check printf fns. a1 is the 1-based index of + * the parameter containing the format, and a2 the index of the first + * argument. **/ #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) #else #define PRINTF_ATTRIBUTE(a1, a2) -- cgit From cc0846f967f268764bff280f64d5cb47b716d796 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Thu, 20 Dec 2001 04:01:44 +0000 Subject: Add --enable-dmalloc to link against the dmalloc malloc debugger. It's not as strong as Insure, but it's free, reasonably efficient and works on every platform. (This used to be commit e76d27fcdb33df5212ca5b0ce53c77ed8ca58906) --- source3/include/includes.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3b2b1db877..92ac462e1b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -975,6 +975,13 @@ int vasprintf(char **ptr, const char *format, va_list ap); #include #endif +/* dmalloc -- free heap debugger (dmalloc.org). This should be near + * the *bottom* of include files so as not to conflict. */ +#ifdef DMALLOC +# include +#endif + + /* Some POSIX definitions for those without */ #ifndef S_IFDIR -- cgit From 34037e2479981073c8289fe51868b29096cc5808 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 30 Dec 2001 05:59:43 +0000 Subject: Make Samba compile on RH 6.2 again. We now include the libber.h file if required, but currently we just don't use ldap. (I'll chase this up). In the meantime, I've moved the ads_status code about, its now in its own file, and has a couple of #ifdefs to allow smbd to link - becouse the lack of LDAP caused HAVE_ADS to be undefined. (I hope its not too ugly). Andrew Bartlett (This used to be commit 14407c87e2dcccae1784290e3eb7a2d611516aff) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 92ac462e1b..3a4c50ab9a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -385,6 +385,10 @@ #undef HAVE_KRB5 #endif +#if HAVE_LBER_H +#include +#endif + #if HAVE_LDAP_H #include #else -- cgit From 162a6606bdcb075c256980fb3a559e59d89f2192 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 31 Dec 2001 14:31:13 +0000 Subject: cope with systems that don't have full gssapi libs (This used to be commit c4d928e55fe99a3a1c4e53508a44949f92d74219) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3a4c50ab9a..c113a14f62 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -408,7 +408,7 @@ #endif /* we support ADS if we have krb5 and ldap libs */ -#if defined(HAVE_KRB5) && defined(HAVE_LDAP) +#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_GSSAPI) #define HAVE_ADS #endif -- cgit From c0fb3e1396d04671df456e4805b331e33f7f543d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 1 Jan 2002 04:05:10 +0000 Subject: renamed ans1.h to asn_1.h to prevent conflict caused by krb5 headers on some platforms using "" instead of <> in include statements (This used to be commit d0ba307032340a22d77cb1d8fc78b4234e1a963c) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c113a14f62..70fc41034c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -724,7 +724,7 @@ extern int errno; #include "session.h" -#include "asn1.h" +#include "asn_1.h" #include "popt.h" -- cgit From abc6e70ca4824f7d7df5f4f68da4686018f9723c Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 9 Jan 2002 05:10:47 +0000 Subject: Fix macro name controlling inclusion of DMALLOC. (This used to be commit a57e13b8b661dd41e8036f862c708b5d3ced82e6) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 70fc41034c..6021ebb83b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -981,7 +981,7 @@ int vasprintf(char **ptr, const char *format, va_list ap); /* dmalloc -- free heap debugger (dmalloc.org). This should be near * the *bottom* of include files so as not to conflict. */ -#ifdef DMALLOC +#ifdef ENABLE_DMALLOC # include #endif -- cgit From bb21af13e36d476e52a6151be1d7bbf9ed6e6412 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 9 Jan 2002 05:27:59 +0000 Subject: Add UNUSED(paramname) macro to be used in parameter lists, to quieten gcc warnings about unused parameters. (This used to be commit b29775d442c36f667a6db5ba9dbe47d1a133525f) --- source3/include/includes.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6021ebb83b..fa6fad4605 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -2,9 +2,9 @@ #define _INCLUDES_H /* Unix SMB/Netbios implementation. - Version 1.9. Machine customisation and include handling Copyright (C) Andrew Tridgell 1994-1998 + Copyright (C) 2002 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,6 +63,15 @@ #define PRINTF_ATTRIBUTE(a1, a2) #endif +#ifdef __GNUC__ +/** gcc attribute used on function parameters so that it does not emit + * warnings about them being unused. **/ +# define UNUSED(param) param __attribute__ ((unused)) +#else +# define UNUSED(param) param +/** Feel free to add definitions for other compilers here. */ +#endif + #ifdef RELIANTUNIX /* * has to be included before any other to get -- cgit From 3454945146bdef0108f3a55fb32456cccf15f188 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 10 Jan 2002 00:28:09 +0000 Subject: Getting ready to add UNIX extensions in HEAD also. Jeremy (This used to be commit 6210d4aa196c944e47076e316980f76ac9c6b02d) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fa6fad4605..0ea387c19c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -523,7 +523,11 @@ typedef int socklen_t; */ #ifndef SMB_DEV_T -#define SMB_DEV_T dev_t +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_DEV64_T) +# define SMB_DEV_T dev64_t +# else +# define SMB_DEV_T dev_t +# endif #endif /* -- cgit From 1a74d8d1f0758d15c5c35d20e33d9868565812cf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 20 Jan 2002 14:30:58 +0000 Subject: This is another *BIG* change... Samba now features a pluggable passdb interface, along the same lines as the one in use in the auth subsystem. In this case, only one backend may be active at a time by the 'normal' interface, and only one backend per passdb_context is permitted outside that. This pluggable interface is designed to allow any number of passdb backends to be compiled in, with the selection at runtime. The 'passdb backend' paramater has been created (and documented!) to support this. As such, configure has been modfied to allow (for example) --with-ldap and the old smbpasswd to be selected at the same time. This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua. These two backends accept 'non unix accounts', where the user does *not* exist in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to avoid conflicts in the algroitmic mapping of RIDs, they use the values specified in the 'non unix account range' paramter - in the same way as the winbind ranges are specifed. While I was at it, I cleaned up some of the code in pdb_tdb (code copied directly from smbpasswd and not really considered properly). Most of this was to do with % macro expansion on stored data. It isn't easy to get the macros into the tdb, and the first password change will 'expand' them. tdbsam needs to use a similar system to pdb_ldap in this regard. This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I don't have the test facilities for these. I plan to incoroprate at least pdb_ldap into this scheme after consultation with Jerry. Each (converted) passdb module now no longer has any 'static' variables, and only exports 1 init function outside its .c file. The non-unix-account support in this patch has been proven! It is now possible to join a win2k machine to a Samba PDC without an account in /etc/passwd! Other changes: Minor interface adjustments: pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*. pdb_update_sam_account() no longer takes the 'override' argument that was being ignored so often (every other passdb backend). Extra checks have been added in some places. Minor code changes: smbpasswd no longer attempts to initialise the passdb at startup, this is now done on first use. pdbedit has lost some of its 'machine account' logic, as this behaviour is now controlled by the passdb subsystem directly. The samr subsystem no longer calls 'local password change', but does the pdb interactions directly. This allow the ACB_ flags specifed to be transferred direct to the backend, without interference. Doco: I've updated the doco to reflect some of the changes, and removed some paramters no longer applicable to HEAD. (This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0ea387c19c..7f913ba830 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -735,6 +735,8 @@ extern int errno; #include "auth.h" +#include "passdb.h" + #include "session.h" #include "asn_1.h" -- cgit From cd68afe31256ad60748b34f7318a180cfc2127cc Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 30 Jan 2002 06:08:46 +0000 Subject: Removed version number from file header. Changed "SMB/Netbios" to "SMB/CIFS" in file header. (This used to be commit 6a58c9bd06d0d7502a24bf5ce5a2faf0a146edfa) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7f913ba830..2037b5ae05 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1,7 +1,7 @@ #ifndef _INCLUDES_H #define _INCLUDES_H /* - Unix SMB/Netbios implementation. + Unix SMB/CIFS implementation. Machine customisation and include handling Copyright (C) Andrew Tridgell 1994-1998 Copyright (C) 2002 by Martin Pool -- cgit From 75de5a5dfa4ccd2f46e9f1bddad7ca2d0d2e665e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 1 Mar 2002 02:56:35 +0000 Subject: The beginning of trusted and trusting domain support from Rafal Szczesniak This adds the 'net' tools to manipulate the trusted domains. Andrew Bartlett (This used to be commit 770c8a31d9804d3339ffa0de8b5072a5c7eb02df) --- source3/include/includes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2037b5ae05..51fc0d153b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -699,7 +699,6 @@ extern int errno; #include "hash.h" #include "trans2.h" #include "nterr.h" -#include "secrets.h" #include "messages.h" #include "util_list.h" #include "charset.h" @@ -718,6 +717,8 @@ extern int errno; #include "smbw.h" #include "nameserv.h" +#include "secrets.h" + #include "byteorder.h" #include "ntdomain.h" -- cgit From 53d0c9c79f614fc8aecd7d417ae7b92d0a06f893 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 2 Mar 2002 05:35:10 +0000 Subject: Remove util_list.h, as its matching .c file has already gone, and nobody is using it anymore. This also removes an early #include of smb.h, making it slightly easier to track whats being included where. Andrew Bartlett (This used to be commit 9d25e3023272a55a39f80305f0f336c655833d55) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 51fc0d153b..3bb7d13f7f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -685,6 +685,9 @@ extern int errno; #define NGROUPS_MAX 32 /* Guess... */ #endif +/* Our own pstrings and fstrings */ +#include "pstring.h" + /* Lists, trees, caching, database... */ #include "xfile.h" #include "intl.h" @@ -700,7 +703,6 @@ extern int errno; #include "trans2.h" #include "nterr.h" #include "messages.h" -#include "util_list.h" #include "charset.h" #include "dynconfig.h" -- cgit From 0cb0c6e90348c9e85e38b65778b93a78af7462a5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 27 Mar 2002 23:17:50 +0000 Subject: Added sys_adminlog() system for info the appliance admins really need to know about. Different from the DEBUG system. Jeremy. (This used to be commit 74eac41c681f92a6da0ae2167f031e021862e0d8) --- source3/include/includes.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3bb7d13f7f..e19961b575 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1049,6 +1049,39 @@ int vasprintf(char **ptr, const char *format, va_list ap); #define S_IXOTH 00001 /* execute permission: other */ #endif +/* For sys_adminlog(). */ +#ifndef LOG_EMERG +#define LOG_EMERG 0 /* system is unusable */ +#endif + +#ifndef LOG_ALERT +#define LOG_ALERT 1 /* action must be taken immediately */ +#endif + +#ifndef LOG_CRIT +#define LOG_CRIT 2 /* critical conditions */ +#endif + +#ifndef LOG_ERR +#define LOG_ERR 3 /* error conditions */ +#endif + +#ifndef LOG_WARNING +#define LOG_WARNING 4 /* warning conditions */ +#endif + +#ifndef LOG_NOTICE +#define LOG_NOTICE 5 /* normal but significant condition */ +#endif + +#ifndef LOG_INFO +#define LOG_INFO 6 /* informational */ +#endif + +#ifndef LOG_DEBUG +#define LOG_DEBUG 7 /* debug-level messages */ +#endif + /* NetBSD doesn't have these */ #ifndef SHM_R #define SHM_R 0400 -- cgit From 9cd0306baa1b3a78b40ab97b5d199b90a4c34aa6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 11 Apr 2002 02:20:56 +0000 Subject: This split the mangling code up to allow for the possibility of multiple mangling implementation, selectable using "mangling method = " in smb.conf It also tidies the interface a little, although it is still nasty. (This used to be commit be23d87a178e7d0691e7d942adf89bb3d2d533c2) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e19961b575..5da1c1d997 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -746,6 +746,8 @@ extern int errno; #include "popt.h" +#include "mangle.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif -- cgit From e90b65284812aaa5ff9e9935ce9bbad7791cbbcd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 15 Jul 2002 10:35:28 +0000 Subject: updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce) --- source3/include/includes.h | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5da1c1d997..435810a1ba 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -434,8 +434,12 @@ /* * Define additional missing types */ -#ifndef HAVE_SIG_ATOMIC_T_TYPE -typedef int sig_atomic_t; +#if defined(HAVE_SIG_ATOMIC_T_TYPE) && defined(AIX) +typedef sig_atomic_t SIG_ATOMIC_T; +#elif defined(HAVE_SIG_ATOMIC_T_TYPE) && !defined(AIX) +typedef sig_atomic_t VOLATILE SIG_ATOMIC_T; +#else +typedef int VOLATILE SIG_ATOMIC_T; #endif #ifndef HAVE_SOCKLEN_T_TYPE @@ -696,6 +700,7 @@ extern int errno; #include "dlinklist.h" #include "../tdb/tdb.h" #include "../tdb/spinlock.h" +#include "../tdb/tdbutil.h" #include "talloc.h" #include "ads.h" #include "interfaces.h" @@ -748,10 +753,6 @@ extern int errno; #include "mangle.h" -#ifndef MAXCODEPAGELINES -#define MAXCODEPAGELINES 256 -#endif - /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. @@ -942,6 +943,14 @@ size_t strlcat(char *d, const char *s, size_t bufsize); int ftruncate(int f,long l); #endif +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t n); +#endif + +#ifndef HAVE_STRNLEN +size_t strnlen(const char *s, size_t n); +#endif + #ifndef HAVE_STRTOUL unsigned long strtoul(const char *nptr, char **endptr, int base); #endif @@ -993,9 +1002,9 @@ int vasprintf(char **ptr, const char *format, va_list ap); #define DEFAULT_SOCKET_OPTIONS "" #endif -/* Load header file for libdl stuff */ +/* Load header file for dynamic linking stuff */ -#ifdef HAVE_LIBDL +#ifdef HAVE_DLFCN_H #include #endif @@ -1155,5 +1164,13 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #define slprintf snprintf #define vslprintf vsnprintf + +/* we need to use __va_copy() on some platforms */ +#ifdef HAVE_VA_COPY +#define VA_COPY(dest, src) __va_copy(dest, src) +#else +#define VA_COPY(dest, src) (dest) = (src) +#endif + #endif /* _INCLUDES_H */ -- cgit From b2edf254eda92f775e7d3d9b6793b4d77f9000b6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 17 Aug 2002 17:00:51 +0000 Subject: sync 3.0 branch with head (This used to be commit 3928578b52cfc949be5e0ef444fce1558d75f290) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 435810a1ba..6084d583ed 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -707,9 +707,11 @@ extern int errno; #include "hash.h" #include "trans2.h" #include "nterr.h" +#include "ntioctl.h" #include "messages.h" #include "charset.h" #include "dynconfig.h" +#include "adt_tree.h" #include "util_getent.h" -- cgit From a834a73e341059be154426390304a42e4a011f72 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 25 Sep 2002 15:19:00 +0000 Subject: sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139) --- source3/include/includes.h | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6084d583ed..56b8357831 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -216,7 +216,15 @@ #include #include #include + +#ifdef HAVE_SYSLOG_H #include +#else +#ifdef HAVE_SYS_SYSLOG_H +#include +#endif +#endif + #include #ifdef HAVE_NETINET_TCP_H @@ -406,18 +414,14 @@ #if HAVE_GSSAPI_GSSAPI_H #include -#else -#undef HAVE_KRB5 #endif #if HAVE_GSSAPI_GSSAPI_GENERIC_H #include -#else -#undef HAVE_KRB5 #endif -/* we support ADS if we have krb5 and ldap libs */ -#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_GSSAPI) +/* we support ADS if we want it and have krb5 and ldap libs */ +#if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS #endif @@ -702,6 +706,7 @@ extern int errno; #include "../tdb/spinlock.h" #include "../tdb/tdbutil.h" #include "talloc.h" +#include "nt_status.h" #include "ads.h" #include "interfaces.h" #include "hash.h" @@ -747,6 +752,8 @@ extern int errno; #include "passdb.h" +#include "sam.h" + #include "session.h" #include "asn_1.h" @@ -755,6 +762,8 @@ extern int errno; #include "mangle.h" +#include "nsswitch/winbind_client.h" + /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. @@ -794,6 +803,11 @@ struct functable { #include "nsswitch/nss.h" +/* forward declaration from printing.h to get around + header file dependencies */ + +struct printjob; + /***** automatically generated prototypes *****/ #include "proto.h" @@ -895,24 +909,6 @@ struct functable { #define ULTRIX_AUTH 1 #endif -#ifdef HAVE_LIBREADLINE -# ifdef HAVE_READLINE_READLINE_H -# include -# ifdef HAVE_READLINE_HISTORY_H -# include -# endif -# else -# ifdef HAVE_READLINE_H -# include -# ifdef HAVE_HISTORY_H -# include -# endif -# else -# undef HAVE_LIBREADLINE -# endif -# endif -#endif - #ifndef HAVE_STRDUP char *strdup(const char *s); #endif -- cgit From 2f367b091ed11b095bc52c594df006ea9ffa9be4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 29 Oct 2002 17:31:00 +0000 Subject: Sync with HEAD (This used to be commit a64affffb2acf68956dc25be45c0559e6139a571) --- source3/include/includes.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 56b8357831..01b9f14979 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -823,11 +823,6 @@ struct printjob; #define QSORT_CAST (int (*)(const void *, const void *)) #endif -/* this guess needs to be improved (tridge) */ -#if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV) -#define SYSV 1 -#endif - #ifndef DEFAULT_PRINTING #ifdef HAVE_CUPS #define DEFAULT_PRINTING PRINT_CUPS -- cgit From 1608de77a4c916fefb4d98e0678f59dcab973ffd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 29 Oct 2002 21:26:33 +0000 Subject: Remove SAM - it belongs in HEAD (This used to be commit 808dbcf345d0e00dc5bc0af2ef54f31a554824f0) --- source3/include/includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 01b9f14979..7d8f44727a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -752,8 +752,6 @@ extern int errno; #include "passdb.h" -#include "sam.h" - #include "session.h" #include "asn_1.h" -- cgit From dc5297f413c40f04e1fdae719e29d949e3301091 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 9 Nov 2002 16:57:45 +0000 Subject: Sync with HEAD (This used to be commit 1a25dc776ddc36de9a214e023becff1ceb10290c) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7d8f44727a..41eda71554 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1163,5 +1163,9 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #define VA_COPY(dest, src) (dest) = (src) #endif +#ifndef HAVE_TIMEGM +time_t timegm(struct tm *tm); +#endif + #endif /* _INCLUDES_H */ -- cgit From 6a019636b980857cf896f250841de757644ba9dd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 3 Dec 2002 08:02:41 +0000 Subject: Fixed nasty bug where file writes with start offsets in the range 0x80000000 -> 0xFFFFFFFF would fail as they were being cast from IVAL (uint32) to SMB_OFF_T (off_t or off64_t, both *signed* types). The sign extension would cause the offset to be treated as negative. Thanks to Herb for helping me track this one down (IRIX is good for large file tests :-). Jeremy. PS. That horrid EXEXIST thing has broken configure..... (This used to be commit 2d14c442bc601a277458b69f05a763aa2a1ab3b7) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 41eda71554..395b456fba 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -589,9 +589,11 @@ typedef int socklen_t; #ifdef LARGE_SMB_OFF_T #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32)) +#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ))) #else #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0)) +#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint32)(IVAL((buf),(off)))) & 0xFFFFFFFF ))) #endif /* -- cgit From 3fc4d88d99b8629e7e3f97d6e70254ef0865a5e5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 10 Dec 2002 23:44:33 +0000 Subject: Fix client reporting of 64 bit files. Jeremy. (This used to be commit 8dcbfa4e770d74d4ce6faaf1a0597d07d0a5cc81) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 395b456fba..87b7e02cbf 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -590,10 +590,14 @@ typedef int socklen_t; #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32)) #define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ))) +#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF)) | \ + (( ((SMB_BIG_UINT)(IVAL((buf),(off+4)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ) << 32 ) ) #else #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0)) #define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint32)(IVAL((buf),(off)))) & 0xFFFFFFFF ))) +#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF)) | \ + (( ((SMB_BIG_UINT)(IVAL((buf),(off+4)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ) << 32 ) ) #endif /* -- cgit From 39c78bf516f4db59fd3c218f67d13dd658daf558 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 11 Dec 2002 23:54:40 +0000 Subject: Fixed auth module code. Added VALGRIND defines to reduce spurious warnings. Jeremy. (This used to be commit ec4ed45563f9d8e25fcfd88840944a90b3139c3e) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 87b7e02cbf..b7aa700479 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1173,5 +1173,9 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); time_t timegm(struct tm *tm); #endif +#if defined(VALGRIND) +#define strlen(x) valgrind_strlen(x) +#endif + #endif /* _INCLUDES_H */ -- cgit From 64501e44ee672936b206ed2d80e13e4c39bbd95c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 30 Dec 2002 23:55:53 +0000 Subject: Catching up with old patches. Add define for VERITAS quota support. Check return in ldap. Jeremy. (This used to be commit 66eff26fc930e37035bba8672f5fd3aeae71078d) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b7aa700479..58f1565d80 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1177,5 +1177,13 @@ time_t timegm(struct tm *tm); #define strlen(x) valgrind_strlen(x) #endif +/* + * Veritas File System. Often in addition to native. + * Quotas different. + */ +#if defined(HAVE_SYS_FS_VX_QUOTA_H) +#define VXFS_QUOTA +#endif + #endif /* _INCLUDES_H */ -- cgit From 43059acb95837fce3c8fdf5fc71b96c403e61939 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 3 Jan 2003 03:24:23 +0000 Subject: Merge from HEAD - add PRINTF_ATTRIBUTE to a few more functions. (This used to be commit 9e5297131cc53d7161aa74566f147b98e1c27aaa) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 58f1565d80..391d1bf1f9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1156,6 +1156,15 @@ int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif +void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); + +int pstr_sprintf(pstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); +int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); + +int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); + +int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); + /* we used to use these fns, but now we have good replacements for snprintf and vsnprintf */ #define slprintf snprintf -- cgit From 634c54310c92c48dd4eceec602e230a021bdcfc5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 3 Jan 2003 08:28:12 +0000 Subject: Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 391d1bf1f9..7900c8a3a3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -793,7 +793,7 @@ typedef struct smb_wpasswd { /* used in net.c */ struct functable { - char *funcname; + const char *funcname; int (*fn)(int argc, const char **argv); }; -- cgit From 99cdb462083381c88689a4e698ca48b6ed4cf5ac Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 15 Jan 2003 18:57:41 +0000 Subject: *lots of small merges form HEAD *sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7900c8a3a3..98e38ac817 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -754,6 +754,8 @@ extern int errno; #include "md5.h" #include "hmacmd5.h" +#include "ntlmssp.h" + #include "auth.h" #include "passdb.h" -- cgit From 7dd7d3a96a9f23f1a7474625957fe3452222809a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 16 Jan 2003 02:39:49 +0000 Subject: Fist part of fixes to make us compile with Heimdal. Don't explicitly detect for now, I still have vague hopes of hiding the differences between MIT and Heimdal with a compatibility layer.... Jeremy. (This used to be commit 54d83de8a23937f1d8179a7e2596df3c50785618) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 98e38ac817..d5153a196c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -412,6 +412,10 @@ #undef HAVE_LDAP #endif +#if HAVE_GSSAPI_H +#include +#endif + #if HAVE_GSSAPI_GSSAPI_H #include #endif -- cgit From cdc6c1662d4c150c69cd93991b211abb58b89859 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 16 Jan 2003 02:58:14 +0000 Subject: More Heimdal changes. Still not compiling with Heimdal yet... Jeremy. (This used to be commit 4333be5732de07786254382a4aa41333783d81b5) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d5153a196c..a02713e36f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -424,6 +424,10 @@ #include #endif +#if HAVE_COM_ERR_H +#include +#endif + /* we support ADS if we want it and have krb5 and ldap libs */ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS -- cgit From 812e093f026a3575f00633c8d4d63b8bdb8a1bcb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sun, 19 Jan 2003 22:27:32 +0000 Subject: Merge in more of the SuSE patches for Heimdal. These changes show how to add a function without an explicit #ifdef HEIMDAL which I'm trying to avoid. Jeremy. (This used to be commit 92ecd0bf0fe2cc4f6c86ca48e6e458e726470a50) --- source3/include/includes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a02713e36f..618719d630 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1204,5 +1204,17 @@ time_t timegm(struct tm *tm); #define VXFS_QUOTA #endif +#if defined(HAVE_KRB5) + +#ifndef KRB5_SET_REAL_TIME +krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); +#endif + +#ifndef HAVE_KRB5_SET_DEFAULT_TGS_KTYPES +krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); +#endif + +#endif /* HAVE_KRB5 */ + #endif /* _INCLUDES_H */ -- cgit From 18c2948bc536552ed2949f8fe1d06a72b9cc66dd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 21 Jan 2003 13:33:31 +0000 Subject: Fixup proto generation to not include krb5 specific symbols if no kerberos selected. Noticed by Metze. Jeremy. (This used to be commit 0c98f779f05431ac4d298c9f021fca85d16aebae) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 618719d630..23d6d1c457 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,6 +1214,9 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); #endif +/* Samba wrapper function for krb5 functionality. */ +void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); + #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ -- cgit From e545fe3c0aa1901026d5d11fa48d084e4cecde40 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 21 Jan 2003 20:43:26 +0000 Subject: Get closer to Heimdal compile... Damn. HEAD has different code in kerberos_verify... Jeremy. (This used to be commit e8c4098da619a1429cc4c8251761333a7c0f3458) --- source3/include/includes.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 23d6d1c457..c329085c97 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,8 +1214,18 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); #endif -/* Samba wrapper function for krb5 functionality. */ +#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) +krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, + krb5_auth_context auth_context, + krb5_keyblock *keyblock); +#endif + +/* Samba wrapper functions for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); +int create_kerberos_key_from_string(krb5_context context, + krb5_principal host_princ, + krb5_data *password, + krb5_keyblock *key); #endif /* HAVE_KRB5 */ -- cgit From 755e33ee3f25884096d3fa2ac4bd4cf64a794903 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 28 Jan 2003 00:33:21 +0000 Subject: Get smbd to link with Heimdal. Still missing some client progs... Jeremy. (This used to be commit 85dda434763bbcea260c800599e4b6b73afcf174) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c329085c97..cb2d57ea04 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1227,6 +1227,9 @@ int create_kerberos_key_from_string(krb5_context context, krb5_data *password, krb5_keyblock *key); +void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); +krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); + #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ -- cgit From b1bce451411486525e72ec71c5fd37fc0b463add Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 28 Jan 2003 03:31:33 +0000 Subject: Finally we compile with Heimdal as well as MIT ! Wonder if it works... :-). Jeremy. (This used to be commit 1b71786c161cd8ec4c3c0c6b178370ed50feeef4) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index cb2d57ea04..08e801427c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1229,6 +1229,7 @@ int create_kerberos_key_from_string(krb5_context context, void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); +krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); #endif /* HAVE_KRB5 */ -- cgit From cf292aead6bdcced9deac62c50b25e83779d9741 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 30 Jan 2003 04:40:12 +0000 Subject: Sync of Heimdal kerberos stuff with HEAD. If this breaks I'm blaming the dog again. (This used to be commit 6f89ee2c9dc7f03e3dbe7aa734bf67c6a434d135) --- source3/include/includes.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 08e801427c..23d6d1c457 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,22 +1214,8 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); #endif -#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) -krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, - krb5_auth_context auth_context, - krb5_keyblock *keyblock); -#endif - -/* Samba wrapper functions for krb5 functionality. */ +/* Samba wrapper function for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); -int create_kerberos_key_from_string(krb5_context context, - krb5_principal host_princ, - krb5_data *password, - krb5_keyblock *key); - -void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); -krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); -krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); #endif /* HAVE_KRB5 */ -- cgit From 59222d70e2b71bff5e97df0b37c4c76b202931fc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 30 Jan 2003 20:36:44 +0000 Subject: Re-added the Heimdal stuff tpot removed. Jeremy. (This used to be commit e79dc0dade1ab1c9f8b3af5c01248bda70cfd582) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 23d6d1c457..d48103cbe3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,8 +1214,16 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); #endif +#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) +krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock); +#endif + /* Samba wrapper function for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); +int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key); +void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); +krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); +krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); #endif /* HAVE_KRB5 */ -- cgit From 251ea1e6776401005e302addd56a689c01924426 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 19 Feb 2003 12:31:16 +0000 Subject: Merge minor library fixes from HEAD to 3.0. - setenv() replacement - mimir's ASN1/SPNEGO typo fixes - (size_t)-1 fixes for push_* returns - function argument signed/unsigned correction - ASN1 error handling (ensure we don't use initiailsed data) - extra net ads join error checking - allow 'set security discriptor' to fail - escape ldap strings in libads. - getgrouplist() correctness fixes (include primary gid) Andrew Bartlett (This used to be commit e9d6e2ea9a3dc01d3849b925c50702cda6ddf225) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d48103cbe3..5aaf009738 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -962,6 +962,10 @@ size_t strnlen(const char *s, size_t n); unsigned long strtoul(const char *nptr, char **endptr, int base); #endif +#ifndef HAVE_SETENV +int setenv(const char *name, const char *value, int overwrite); +#endif + #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESUID_DECL)) /* stupid glibc */ int setresuid(uid_t ruid, uid_t euid, uid_t suid); -- cgit From 83a11f7f0e4331602acefcb3324be6f35f1fef0e Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Wed, 19 Feb 2003 15:48:12 +0000 Subject: Sync with HEAD for verifying kerberos tickets. (This used to be commit 77e1178a888f0d380a5ef94911a8f07bf04a7ba3) --- source3/include/includes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5aaf009738..d33c7d766a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1224,11 +1224,12 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con /* Samba wrapper function for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); -int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key); +int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); - +krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); +void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ -- cgit From a9ae0df3332270cc66cd9167564ff9ee93f23f44 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 24 Feb 2003 03:27:29 +0000 Subject: Iconv as seperate library fixes from HEAD (This used to be commit 935c66f6a02c7ba764fbcc643a91833deb588bc0) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d33c7d766a..e25ac4fef2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -393,8 +393,13 @@ #endif /* HAVE_SYS_SHM_H */ #ifdef HAVE_NATIVE_ICONV +#ifdef HAVE_ICONV #include #endif +#ifdef HAVE_GICONV +#include +#endif +#endif #if HAVE_KRB5_H #include -- cgit From ec458fa87e3ee858be39671f575e21a9350674b6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 17 Mar 2003 22:45:16 +0000 Subject: Merge from HEAD - sync up SessionSetup code to HEAD, including Luke Howard's session key and auth verifier patches. Andrew Bartlett (This used to be commit 3f9616a68a855acbae3f405c27ee2358fbe7ba2c) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e25ac4fef2..774df34de0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1235,6 +1235,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); +BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ -- cgit From d5ee9b2f480ddbda0b8f69409698d27c99384f9c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 18 Mar 2003 11:22:52 +0000 Subject: Jeremy merged across my string parinoia fixes, but forgot to enable them! :-) This patch catches up on the rest of the work - as much string checking as is possible is done at compile time, and the rest at runtime. Lots of code converted to pstrcpy() etc, and other code reworked to correctly call sizeof(). Andrew Bartlett (This used to be commit c5b604e2ee67d74241ae2fa07ae904647d35a2be) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 774df34de0..bdd8661f6f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -832,6 +832,7 @@ struct printjob; /* String routines */ +#include "srvstr.h" #include "safe_string.h" #ifdef __COMPAR_FN_T -- cgit From 567fcd81ed7e8cda0640d100f501083632b130f3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 28 Mar 2003 01:07:05 +0000 Subject: merged real time signal fixes from head (This used to be commit 03a5e62300f3cfb96d14570b73a758e6fa64c449) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bdd8661f6f..168256fd56 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -864,6 +864,10 @@ struct printjob; #define SIGCLD SIGCHLD #endif +#ifndef SIGRTMIN +#define SIGRTMIN 32 +#endif + #ifndef MAP_FILE #define MAP_FILE 0 #endif -- cgit From a50e82cac2212f4aa1e40dc74892e9398682daf1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 28 Mar 2003 02:03:31 +0000 Subject: don't include proto.h during autoconf tests since it doesn't exist yet; fixed getsmbpass replacement test (This used to be commit 2aa2767ed5dc5290d6f71174bbf1be7d75a97d8b) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 168256fd56..41f6075a20 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -828,7 +828,9 @@ struct functable { struct printjob; /***** automatically generated prototypes *****/ +#ifndef NO_PROTO_H #include "proto.h" +#endif /* String routines */ -- cgit From 759179b1902d2847cce199e2efa1f830ec675427 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 2 Apr 2003 06:16:15 +0000 Subject: Merge of winbind nss library cleanup from HEAD. (This used to be commit a4b5f2c01bae049edc4f385cb0441bbde4fb443b) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 41f6075a20..f6d26afe4f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -820,7 +820,7 @@ struct functable { #define UNI_XDIGIT 0x8 #define UNI_SPACE 0x10 -#include "nsswitch/nss.h" +#include "nsswitch/winbind_nss.h" /* forward declaration from printing.h to get around header file dependencies */ -- cgit From 0fa29335dcbb3c67a21ff43f1c0a40cf9cd9e90d Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 01:19:58 +0000 Subject: Merge of TRUE/FALSE preprocessor traps from HEAD. (This used to be commit 2a962393017e65cb67944740e4faaad9902764e8) --- source3/include/includes.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f6d26afe4f..1fc7c3c51a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1245,5 +1245,18 @@ void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); #endif /* HAVE_KRB5 */ -#endif /* _INCLUDES_H */ +/* TRUE and FALSE are part of the C99 standard and gcc, but + unfortunately many vendor compilers don't support them. Use True + and False instead. */ + +#ifdef TRUE +#undef TRUE +#endif +#define TRUE __ERROR__XX__DONT_USE_TRUE +#ifdef FALSE +#undef FALSE +#endif +#define FALSE __ERROR__XX__DONT_USE_FALSE + +#endif /* _INCLUDES_H */ -- cgit From 10bf059b62480d502652408e9c138445859789fc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 21:49:49 +0000 Subject: Backport my backtrace patch from HEAD (This used to be commit 66fcf6b4938a87e5ded7c7e5830a6a54e4439544) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1fc7c3c51a..d406c07d06 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -345,6 +345,10 @@ #include #endif +#ifdef HAVE_EXECINFO_H +#include +#endif + #ifdef HAVE_SYS_CAPABILITY_H #if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) -- cgit From 8cb0672c580e9fb8beff576b0fa53f9c07978911 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 16 Apr 2003 13:19:51 +0000 Subject: Merge valgrind header usage from HEAD. (This used to be commit 5c978e39f2879d900a1bcad535b489f4cd440906) --- source3/include/includes.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d406c07d06..3ff80d07ab 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -437,6 +437,23 @@ #include #endif +/* Special macros that are no-ops except when run under Valgrind on + * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ +#if HAVE_VALGRIND_MEMCHECK_H + /* memcheck.h includes valgrind.h */ +#include +#elif HAVE_VALGRIND_H +#include +#endif + +/* If we have --enable-developer and the valgrind header is present, + * then we're OK to use it. Set a macro so this logic can be done only + * once. */ +#if defined(DEVELOPER) && (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) +#define VALGRIND +#endif + + /* we support ADS if we want it and have krb5 and ldap libs */ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS @@ -1212,10 +1229,6 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE( time_t timegm(struct tm *tm); #endif -#if defined(VALGRIND) -#define strlen(x) valgrind_strlen(x) -#endif - /* * Veritas File System. Often in addition to native. * Quotas different. -- cgit From 4d6c97edb2a8760bd0a34061017dae8688cb32fe Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 29 Apr 2003 06:03:04 +0000 Subject: remove --with-tdbsam since it is always built now (This used to be commit f277cd54ea6be5cad6ea765d992bc4133765ef92) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3ff80d07ab..7bcd31f623 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -895,7 +895,7 @@ struct printjob; #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) #define USE_SMBPASS_DB 1 #endif -- cgit From 06551c644c75ab2aa14a3cc3c4afbcbb08369133 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 6 May 2003 02:34:59 +0000 Subject: Patch from metze to add exit and interval events. Useful for modules (This used to be commit 3033a63cefb5f28d4460885f7f4e4ecaed95443c) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7bcd31f623..9e4c508477 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -802,6 +802,8 @@ extern int errno; #include "mangle.h" +#include "module.h" + #include "nsswitch/winbind_client.h" /* -- cgit From e7c8c15888454043c73967635deb4d3419a489e9 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Sun, 11 May 2003 23:34:18 +0000 Subject: Fix VFS layer: 1. Finally work with cascaded modules with private data storage per module 2. Convert VFS API to macro calls to simplify cascading 3. Add quota support to VFS layer (prepare to NT quota support) Patch by Stefan (metze) Metzemacher, with review of Jelmer and me Tested in past few weeks. Documentation to new VFS API for third-party developers to follow (This used to be commit 91984ef5caa2d13c5d52e1f535bd3bbbae1ec978) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9e4c508477..c1b84c1d35 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -767,6 +767,7 @@ extern int errno; #include "debugparse.h" #include "version.h" +#include "idmap.h" #include "smb.h" #include "smbw.h" #include "nameserv.h" -- cgit From c823b191ab476fc2583d6d6aaa1e2edb09cbb88e Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 12 May 2003 18:12:31 +0000 Subject: And finally IDMAP in 3_0 We really need idmap_ldap to have a good solution with ldapsam, porting it from the prvious code is beeing made, the code is really simple to do so I am confident it is not a problem to commit this code in. Not committing it would have been worst. I really would have been able to finish also the group code, maybe we can put it into a followin release after 3.0.0 even if it may be an upgrade problem. The code has been tested and seem to work right, more testing is needed for corner cases. Currently winbind pdc (working only for users and not for groups) is disabled as I was not able to make a complete group code replacement that works somewhat in a week (I have a complete patch, but there are bugs) Simo. (This used to be commit 0e58085978f984436815114a2ec347cf7899a89d) --- source3/include/includes.h | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c1b84c1d35..8de1395aca 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -767,23 +767,35 @@ extern int errno; #include "debugparse.h" #include "version.h" -#include "idmap.h" + #include "smb.h" -#include "smbw.h" + #include "nameserv.h" #include "secrets.h" #include "byteorder.h" +#include "privileges.h" + +#include "rpc_creds.h" + +#include "mapping.h" + +#include "passdb.h" + #include "ntdomain.h" +#include "rpc_misc.h" + +#include "rpc_secdes.h" + +#include "nt_printing.h" + #include "msdfs.h" #include "smbprofile.h" -#include "mapping.h" - #include "rap.h" #include "md5.h" @@ -793,7 +805,11 @@ extern int errno; #include "auth.h" -#include "passdb.h" +#include "idmap.h" + +#include "client.h" + +#include "smbw.h" #include "session.h" @@ -851,6 +867,8 @@ struct functable { struct printjob; +struct smb_ldap_privates; + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" @@ -898,7 +916,7 @@ struct printjob; #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) +#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) #define USE_SMBPASS_DB 1 #endif -- cgit From 931dc9d25ad20f575bb5ce8e3c935bc9ce1e32bb Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 20 May 2003 18:30:37 +0000 Subject: remove WITH_TDB_SAM & USE_SMBPASS_DB (This used to be commit 1f98ced3163e26818c12829801729bc28f858de7) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8de1395aca..2548db015d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -916,10 +916,6 @@ struct smb_ldap_privates; #define MAP_FILE 0 #endif -#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM)) -#define USE_SMBPASS_DB 1 -#endif - #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS) #define OSF1_ENH_SEC 1 #endif -- cgit From 4f276f969633f3c39e3ffc609b167930ff7fd42c Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Fri, 30 May 2003 20:11:34 +0000 Subject: More on bug 137: rename more of krb5_xxx functions to not start with krb5_ (This used to be commit 10f1da3f4a9680a039a2aa26301b97e31c06c38d) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2548db015d..4de81c46d2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1276,7 +1276,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); -BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); +BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); #endif /* HAVE_KRB5 */ /* TRUE and FALSE are part of the C99 standard and gcc, but -- cgit From 3bdfd57a2dc590896a2e45652ad4f5e3c2358108 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 5 Jun 2003 02:34:30 +0000 Subject: working draft of the idmap_ldap code. Includes sambaUnixIdPool objectclass Still needs cleaning up wrt to name space. More changes to come, but at least we now have a a working distributed winbindd solution. (This used to be commit 824175854421f7c27d31ad673a8790dd018ae350) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4de81c46d2..ac5c48d780 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -869,6 +869,10 @@ struct printjob; struct smb_ldap_privates; +/* forward declarations from smbldap.c */ + +#include "smbldap.h" + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" -- cgit From 8e047054e856b93b6c32b5fd8da6201a50ba016d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 5 Jun 2003 20:29:55 +0000 Subject: Get ready for EA code... Add Linux interface. Jeremy. (This used to be commit 48853140749b74053f1a7857a983397b6e9a0234) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ac5c48d780..7b4c8dbdff 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -437,6 +437,10 @@ #include #endif +#if HAVE_ATTR_XATTR_H +#include +#endif + /* Special macros that are no-ops except when run under Valgrind on * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ #if HAVE_VALGRIND_MEMCHECK_H -- cgit From 5cee22714c1fc418dc8a3e1770e9048071b892d9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 10 Jun 2003 17:30:28 +0000 Subject: Ok, I've tried being Mr. Nice Guy and people (you know who you are) still keep putting bzero BSD'ism's into our source code. Make this an error like bcopy and others to prevent it in future. Jeremy. (This used to be commit 80d043231626192db85f08ccea062b91fcf999cc) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7b4c8dbdff..3dbe6d1093 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1035,10 +1035,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); int vasprintf(char **ptr, const char *format, va_list ap); #endif -#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) -#define bzero(a,b) memset((a),'\0',(b)) -#endif - #ifdef REPLACE_GETPASS #define getpass(prompt) getsmbpass((prompt)) #endif -- cgit From 489956c82391d7559bb097b112957e6a7d91934c Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sun, 15 Jun 2003 06:07:53 +0000 Subject: Patch from vorlon@debian.org, see bugzilal #122 Samba should preferentially use the locale information from the native system, and only fall back on 'display charset' if this is unavailable or unsupported. (This used to be commit 1e445fb4220cdf4700dd9d1850a42746a1065c5a) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3dbe6d1093..edaeda3abe 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -441,6 +441,14 @@ #include #endif +#if HAVE_LOCALE_H +#include +#endif + +#if HAVE_LANGINFO_H +#include +#endif + /* Special macros that are no-ops except when run under Valgrind on * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ #if HAVE_VALGRIND_MEMCHECK_H -- cgit From 8cd67d76683a41a1db5efc3a9c65e056ec2263f4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 16 Jun 2003 02:22:52 +0000 Subject: reverted locale patch put in by jht (originally from vorlon). There are lots of things wrong with this patch, including: 1) it overrides a user chosen configuration option 2) it adds lots of complexity inside a loop when a tiny piece of code outside the loop would do the same thing 3) it does no error checking, and is sure to crash on some systems If you want this functionality then try something like this at the end of charset_name(): #ifdef HAVE_NL_LANGINFO if (strcasecmp(ret, "LOCALE") == 0) { const char *ln = nl_langinfo(CODESET); if (ln) { DEBUG(5,("Substituting charset '%s' for LOCALE\n", ln)); return ln; } } #endif then users can set 'display charset = LOCALE' to get the locale based charset. You could even make that the default for systems that have nl_langinfo(). (This used to be commit 382b9b806b1ecd227b1ea247e3825d6848090462) --- source3/include/includes.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index edaeda3abe..3dbe6d1093 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -441,14 +441,6 @@ #include #endif -#if HAVE_LOCALE_H -#include -#endif - -#if HAVE_LANGINFO_H -#include -#endif - /* Special macros that are no-ops except when run under Valgrind on * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ #if HAVE_VALGRIND_MEMCHECK_H -- cgit From 0a4959d48d62cd97d912182f99e0ea969d48253f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 30 Jun 2003 02:11:13 +0000 Subject: - added LOCALE patch from vorlon@debian.org (Steve Langasek) (bug #122) - changed --enable-developer debug to use -gstabs as it makes the samba binaries about 10x smaller and is still quite functional for samba debugging (This used to be commit 53bfcd478a193d4def8da872e92d7ed8f46aa4b9) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3dbe6d1093..edaeda3abe 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -441,6 +441,14 @@ #include #endif +#if HAVE_LOCALE_H +#include +#endif + +#if HAVE_LANGINFO_H +#include +#endif + /* Special macros that are no-ops except when run under Valgrind on * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ #if HAVE_VALGRIND_MEMCHECK_H -- cgit From 8991cecd543172c10da92853b9b861ce85dafeff Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 23 Jul 2003 03:59:57 +0000 Subject: A fix for bug 174. I'm pushing this to the tree to test it on one of the build farm machines that I don't have direct access to (hpntc9I). (This used to be commit b01965823341bbabb74dcbc09d379b43db2ec680) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index edaeda3abe..77c2b437bd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1232,6 +1232,14 @@ int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif +/* Fix prototype problem with non-C99 compliant snprintf implementations, esp + HPUX 11. Don't change the sense of this #if statement. Read the comments + in lib/snprint.c if you think you need to. See also bugzilla bug 174. */ + +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#define snprintf smb_snprintf +#endif + void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); int pstr_sprintf(pstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); -- cgit From 4632786cfb193dd80ce04206912297186e871814 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 25 Jul 2003 23:15:30 +0000 Subject: W00t! Client smb signing is now working correctly with krb5 and w2k server. Server code *should* also work (I'll check shortly). May be the odd memory leak. Problem was we (a) weren't setting signing on in the client krb5 sessionsetup code (b) we need to ask for a subkey... (c). The client and server need to ask for local and remote subkeys respectively. Thanks to Paul Nelson @ Thursby for some sage advice on this :-). Jeremy. (This used to be commit 3f9e3b60709df5ab755045a093e642510d4cde00) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 77c2b437bd..d900d7feb9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1296,7 +1296,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); -BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); +BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16], BOOL remote); #endif /* HAVE_KRB5 */ /* TRUE and FALSE are part of the C99 standard and gcc, but -- cgit From 7730b658a10c60e0c30c0d16aa4ff2da0a99ac10 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 29 Jul 2003 15:00:38 +0000 Subject: This adds gss-spnego to ntlm_auth. It contains some new spnego support from Jim McDonough. It is to enable cyrus sasl to provide the gss-spnego support. For a preliminary patch to cyrus sasl see http://samba.sernet.de/cyrus-gss-spnego.diff Volker (This used to be commit 45cef8f66e46abe4a25fd2b803a7d1051c1c6602) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d900d7feb9..eb7f73b9d3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -835,6 +835,8 @@ extern int errno; #include "nsswitch/winbind_client.h" +#include "spnego.h" + /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. -- cgit From 17a713d1b9eb00e28036fe9028c09c202340504f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 6 Aug 2003 19:30:42 +0000 Subject: Get rid of MAXPATHLEN, move to standard PATH_MAX. Jeremy. (This used to be commit 455ed2d51d86f39ce0fa6e6abca31a5425d2ea17) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index eb7f73b9d3..09375c84d8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -958,10 +958,6 @@ struct smb_ldap_privates; #define SYNC_DNS 1 #endif -#ifndef MAXPATHLEN -#define MAXPATHLEN 256 -#endif - #ifndef SEEK_SET #define SEEK_SET 0 #endif -- cgit From 23c314bb587a09cd68200c89c56f71e9233c676d Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Fri, 15 Aug 2003 01:29:08 +0000 Subject: add IRIX EA support (This used to be commit 589e94f4ffa325acfd6562a84906639e19fd5d33) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 09375c84d8..0179064a6a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -437,6 +437,10 @@ #include #endif +#if HAVE_SYS_ATTRIBUTES_H +#include +#endif + #if HAVE_ATTR_XATTR_H #include #endif -- cgit From 852ffbda335d04867b188d5bf585d80416c1e393 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 15 Aug 2003 19:29:08 +0000 Subject: Latest heimdal snapshot has a krb5_set_real_time with a slightly different (but by implicit conversion hopefully compatible... ;-) prototype. Fix the build for that. (This used to be commit 497b190edc42cec40fc80e9d9eb6aa4e1a466ac5) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0179064a6a..29bb53980f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1278,7 +1278,7 @@ time_t timegm(struct tm *tm); #if defined(HAVE_KRB5) -#ifndef KRB5_SET_REAL_TIME +#ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif -- cgit From 4c0d641475a9e9ff4048c96a18bc38265780c33e Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 21 Oct 2003 04:08:32 +0000 Subject: If we have blacklisted mmap() try to avoid using it accidentally by undefining the HAVE_MMAP symbol. (This used to be commit c420195231457d3202157490f4bec335a788d8b4) --- source3/include/includes.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 29bb53980f..2a82098fa9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1315,4 +1315,11 @@ BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_conte #endif #define FALSE __ERROR__XX__DONT_USE_FALSE +/* If we have blacklisted mmap() try to avoid using it accidentally by + undefining the HAVE_MMAP symbol. */ + +#ifdef MMAP_BLACKLIST +#undef HAVE_MMAP +#endif + #endif /* _INCLUDES_H */ -- cgit From f3ea6329ba2aa7d5f86c9210ce6209e2d10cbe32 Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Fri, 24 Oct 2003 17:58:30 +0000 Subject: Fix one other place VA_COPY is defined ... should fix NetBSD build. (This used to be commit fb69597629bad305f227b5bab62e0f170d3c164c) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2a82098fa9..74540f81ba 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1259,10 +1259,14 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE( /* we need to use __va_copy() on some platforms */ #ifdef HAVE_VA_COPY +#define VA_COPY(dest, src) va_copy(dest, src) +#else +#ifdef HAVE___VA_COPY #define VA_COPY(dest, src) __va_copy(dest, src) #else #define VA_COPY(dest, src) (dest) = (src) #endif +#endif #ifndef HAVE_TIMEGM time_t timegm(struct tm *tm); -- cgit From 7c55d23cbf4379daae5c9ff25d2f125dcb550fb1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 3 Nov 2003 19:22:32 +0000 Subject: removing #include in hopes to avoid problems with apache header files; will watch the build farm on this to make sure things don't blow up (This used to be commit e92583cecd79adea25caedd1599ac8f36733a923) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 74540f81ba..ebb09b6c6c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -333,10 +333,6 @@ #define PASSWORD_LENGTH 16 #endif /* HAVE_SYS_SECURITY_H */ -#ifdef HAVE_COMPAT_H -#include -#endif - #ifdef HAVE_STROPTS_H #include #endif -- cgit From fcbfc7ad0669009957c65fa61bb20df75a9701b4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 22 Nov 2003 13:19:38 +0000 Subject: Changes all over the shop, but all towards: - NTLM2 support in the server - KEY_EXCH support in the server - variable length session keys. In detail: - NTLM2 is an extension of NTLMv1, that is compatible with existing domain controllers (unlike NTLMv2, which requires a DC upgrade). * This is known as 'NTLMv2 session security' * (This is not yet implemented on the RPC pipes however, so there may well still be issues for PDC setups, particuarly around password changes. We do not fully understand the sign/seal implications of NTLM2 on RPC pipes.) This requires modifications to our authentication subsystem, as we must handle the 'challege' input into the challenge-response algorithm being changed. This also needs to be turned off for 'security=server', which does not support this. - KEY_EXCH is another 'security' mechanism, whereby the session key actually used by the server is sent by the client, rather than being the shared-secret directly or indirectly. - As both these methods change the session key, the auth subsystem needed to be changed, to 'override' session keys provided by the backend. - There has also been a major overhaul of the NTLMSSP subsystem, to merge the 'client' and 'server' functions, so they both operate on a single structure. This should help the SPNEGO implementation. - The 'names blob' in NTLMSSP is always in unicode - never in ascii. Don't make an ascii version ever. - The other big change is to allow variable length session keys. We have always assumed that session keys are 16 bytes long - and padded to this length if shorter. However, Kerberos session keys are 8 bytes long, when the krb5 login uses DES. * This fix allows SMB signging on machines not yet running MIT KRB5 1.3.1. * - Add better DEBUG() messages to ntlm_auth, warning administrators of misconfigurations that prevent access to the privileged pipe. This should help reduce some of the 'it just doesn't work' issues. - Fix data_blob_talloc() to behave the same way data_blob() does when passed a NULL data pointer. (just allocate) REMEMBER to make clean after this commit - I have changed plenty of data structures... (This used to be commit f3bbc87b0dac63426cda6fac7a295d3aad810ecc) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ebb09b6c6c..638648dc44 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1298,7 +1298,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); -BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16], BOOL remote); +BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); #endif /* HAVE_KRB5 */ /* TRUE and FALSE are part of the C99 standard and gcc, but -- cgit From 181f2be495801c2a1d458b99ed2cd2fdff86c2a3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 25 Jan 2004 01:02:39 +0000 Subject: If we are providing strndup(), ensure we provide a prototype too. Andrew Bartlett (This used to be commit 109627145463fc4c00b8f6664e3f2e48e0305d56) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 638648dc44..7f5c111682 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -986,6 +986,10 @@ struct smb_ldap_privates; char *strdup(const char *s); #endif +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t size); +#endif + #ifndef HAVE_MEMMOVE void *memmove(void *dest,const void *src,int size); #endif -- cgit From 95bc32e93ccda3adb4dc54fb20ed3216222006f9 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 19 Feb 2004 22:17:54 +0000 Subject: sys/xattr.h merge from HEAD (This used to be commit 798dd7299e3ba5cd7e829f48bb42eb9cbfc71dd4) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7f5c111682..65eebedc6c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -441,6 +441,10 @@ #include #endif +#if HAVE_SYS_XATTR_H +#include +#endif + #if HAVE_LOCALE_H #include #endif -- cgit From 11bf15746901fe665f166aa148c6de7ca79ed20e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 20 Feb 2004 15:50:18 +0000 Subject: & are mutually exclusive it seems; fix build on SuSE 8.2 (This used to be commit 34e6c5f8f3829e9ff6dd3f1377170fb150bfcec1) --- source3/include/includes.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 65eebedc6c..72f14f5061 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -437,11 +437,10 @@ #include #endif +## mutually exclusive (SuSE 8.2) #if HAVE_ATTR_XATTR_H #include -#endif - -#if HAVE_SYS_XATTR_H +#elif HAVE_SYS_XATTR_H #include #endif -- cgit From 8adb394ee67a8ae69442b80aa5ad7df46368d8fa Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 20 Feb 2004 15:52:14 +0000 Subject: just say no to crack (This used to be commit 66be4492aade625417a6cd727bbe8c6bfb224368) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 72f14f5061..09822daf55 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -437,7 +437,7 @@ #include #endif -## mutually exclusive (SuSE 8.2) +/* mutually exclusive (SuSE 8.2) */ #if HAVE_ATTR_XATTR_H #include #elif HAVE_SYS_XATTR_H -- cgit From 43dd09f9da14eb54f957c4f63e714d27400ad944 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 4 Mar 2004 15:18:36 +0000 Subject: another fix for bug 761; don't default to bsd printing on linux (This used to be commit d58139d64f37fe9fec34492d7857257d9ad4a808) --- source3/include/includes.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 09822daf55..03b6b7165a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -45,15 +45,6 @@ #undef HAVE_TERMIOS_H #endif -#ifdef LINUX -#ifndef DEFAULT_PRINTING -#define DEFAULT_PRINTING PRINT_BSD -#endif -#ifndef PRINTCAP_NAME -#define PRINTCAP_NAME "/etc/printcap" -#endif -#endif - #ifdef __GNUC__ /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first -- cgit From 7f6d708f8678e898bb58500d1bbc9c2473ee9b18 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 4 Mar 2004 18:17:01 +0000 Subject: BUG 1080: fix declaration of SMB_BIG_UINT (This used to be commit 810bc1e2a02c6ab11ef00bf67b49929c596bee33) --- source3/include/includes.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 03b6b7165a..418eb2daa6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -610,6 +610,18 @@ typedef int socklen_t; # endif #endif +#if defined(HAVE_LONGLONG) +#define SMB_BIG_UINT unsigned long long +#define SMB_BIG_INT long long +#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#else +#define SMB_BIG_UINT unsigned long +#define SMB_BIG_INT long +#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#endif + +#define SMB_BIG_UINT_BITS (sizeof(SMB_BIG_UINT)*8) + /* this should really be a 64 bit type if possible */ #define br_off SMB_BIG_UINT @@ -700,18 +712,6 @@ typedef int socklen_t; # endif #endif -#if defined(HAVE_LONGLONG) -#define SMB_BIG_UINT unsigned long long -#define SMB_BIG_INT long long -#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) -#else -#define SMB_BIG_UINT unsigned long -#define SMB_BIG_INT long -#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) -#endif - -#define SMB_BIG_UINT_BITS (sizeof(SMB_BIG_UINT)*8) - #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -- cgit From 9b882ce3e5d3c12e68134a1e2d01abb5849a2902 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 4 Mar 2004 18:34:45 +0000 Subject: BUG 1015: patch from jmcd to fix statfs redeclaration of statfs struct on ppc (This used to be commit fafb243278cd33d696487e477d4685bb79e2e357) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 418eb2daa6..9487accc0d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -338,8 +338,9 @@ #ifdef HAVE_SYS_CAPABILITY_H -#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) +#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) && !defined(_PPC_STATFS_H) #define _I386_STATFS_H +#define _PPC_STATFS_H #define BROKEN_REDHAT_7_STATFS_WORKAROUND #endif @@ -347,6 +348,7 @@ #ifdef BROKEN_REDHAT_7_STATFS_WORKAROUND #undef _I386_STATFS_H +#undef _PPC_STATFS_H #undef BROKEN_REDHAT_7_STATFS_WORKAROUND #endif -- cgit From a26e22edfb036ba0ab9e1a8bbe859ba2c1092b12 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Thu, 11 Mar 2004 15:12:59 +0000 Subject: add missing #ifdef HAVE_BICONV stuff (This used to be commit 9ea0560b0b62dbefaedd640cf9f4f58a0d337abe) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9487accc0d..ea8eb1a304 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -392,6 +392,9 @@ #ifdef HAVE_GICONV #include #endif +#ifdef HAVE_BICONV +#include +#endif #endif #if HAVE_KRB5_H -- cgit From f28e4f386393b500abfc468e390acfb808d6854a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 10 Jun 2004 18:45:45 +0000 Subject: r1111: Rename vsnprintf to smb_vsnprintf so we don't get duplicate symbol errors when linking against an app that does have vsnprintf() (bug #478) (This used to be commit 9f1c978088321b09dea96c54026ebdfaaf770641) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ea8eb1a304..9efdd2cc3a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1239,6 +1239,7 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) #define snprintf smb_snprintf +#define vsnprintf smb_vsnprintf #endif void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); -- cgit From f38c27b4e092f5846bf1b547405df68e4bf3391d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 19 Jun 2004 00:54:54 +0000 Subject: r1193: Ensure we check for and use krb5_free_unparsed_name(). Jeremy. (This used to be commit af5a08f5ad895cb33c9134771da19ba5e709e742) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9efdd2cc3a..ea22475da2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1294,6 +1294,10 @@ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock); #endif +#ifndef (HAVE_KRB5_FREE_UNPARSED_NAME) +void krb5_free_unparsed_name(krb5_context ctx, char *val) +#endif + /* Samba wrapper function for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); -- cgit From ee79226d2a4486be66b47e7ff86e40f91c654ba7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 19 Jun 2004 00:56:50 +0000 Subject: r1195: Ensure libsmb/clikrb5.c compiles. Jeremy. (This used to be commit 7067e274dc208a4ba6677dc19bd224cf03213ed8) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ea22475da2..7657984bfb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1294,8 +1294,8 @@ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock); #endif -#ifndef (HAVE_KRB5_FREE_UNPARSED_NAME) -void krb5_free_unparsed_name(krb5_context ctx, char *val) +#ifndef HAVE_KRB5_FREE_UNPARSED_NAME +void krb5_free_unparsed_name(krb5_context ctx, char *val); #endif /* Samba wrapper function for krb5 functionality. */ -- cgit From e571c8a8ac1f3385796bbaf65d5355cb2bf76885 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 14 Jul 2004 13:32:30 +0000 Subject: r1500: BUG 1516: manually declare ldap_open_with_timeout() to workaround compiler errors on IRIX (This used to be commit b47971174da9ef882e7941e53033e23c679db9a2) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7657984bfb..2664cad098 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1309,6 +1309,15 @@ void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); #endif /* HAVE_KRB5 */ + +#ifdef HAVE_LDAP + +/* function declarations not included in proto.h */ +LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); + +#endif /* HAVE_LDAP */ + + /* TRUE and FALSE are part of the C99 standard and gcc, but unfortunately many vendor compilers don't support them. Use True and False instead. */ -- cgit From 9e2af93087491385c161f1e048824d77c270c9ed Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 11 Aug 2004 09:34:30 +0000 Subject: r1721: Get rid of compiler-warning. Guenther (This used to be commit 153c813464eb54a06bf01146a0eb3d2c908f76bc) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2664cad098..09731a5665 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1307,6 +1307,7 @@ krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); +krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); #endif /* HAVE_KRB5 */ -- cgit From fcbb2d3132df36057da73701f7e23f434034e6b0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 24 Aug 2004 22:48:49 +0000 Subject: r2026: Simplify statcache to use an in-memory tdb. Modify tdb to use a customer hash function for this tdb (yes it does make a difference on benchmarks). Remove the no longer used hash.c code. Jeremy. (This used to be commit 3fbadac85b8cad89b93d295968e99c38c8677575) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 09731a5665..8e9e7b0a46 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -760,7 +760,6 @@ extern int errno; #include "nt_status.h" #include "ads.h" #include "interfaces.h" -#include "hash.h" #include "trans2.h" #include "nterr.h" #include "ntioctl.h" -- cgit From 278f9467f2079044497e3fd4c5358c280f179e41 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 31 Aug 2004 15:11:41 +0000 Subject: r2133: Several fixes: * BUG 1627: fix for NIS compiles on HPUX 11.00, AIX 4.3 and 5.1 patch from Olaf Flebbe . Will need to watch this one in the build farm. * Fix bug found by rwf@loonybin.net where the PRINT_ATTRIBUTE_PUBLISHED was getting reset by attempts to sanitize the defined attributes (PRINTER_ATTRIBUTE_SAMBA) * Resolve name conflict on DEC OSF-5.1 (inspired by patch from Adharsh Praveen ) * Work around parsing error in the print change notify code (not that the alignment bug is still there but reording the entries in the array works around it). * remove duplicate declaration of getprintprocdir from rpcclient. (This used to be commit 7474c6a446037f3ca2546cb6984d800bfc524029) --- source3/include/includes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8e9e7b0a46..66994e9ca9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -369,12 +369,12 @@ #endif #if defined (HAVE_NETGROUP) -#if defined(HAVE_RPCSVC_YP_PROT_H) -#include -#endif #if defined(HAVE_RPCSVC_YPCLNT_H) #include #endif +#if defined(HAVE_RPCSVC_YP_PROT_H) +#include +#endif #endif /* HAVE_NETGROUP */ #if defined(HAVE_SYS_IPC_H) -- cgit From fc84e916f628b4fb6f6667ad45d0ced0e9134b23 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 7 Sep 2004 23:30:27 +0000 Subject: r2246: Some good fixes for HPUX from JBravo on #samba-technical: - Fix linker options so that stuff actually builds (oops - part of this commit was accidentally made in -r2245) - Add some preprocessor magic to avoid warnings being printed for every single C file being compiled. This was due to a bug in the HPUX system header files. This should make the HPUX build farm machine build again. (This used to be commit 46b9d6dcb5bdd47ea82f904d8fac4efe8dc94c9f) --- source3/include/includes.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 66994e9ca9..56624e5198 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -309,6 +309,19 @@ #endif #ifdef HAVE_SHADOW_H +/* + * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in which + * was included above. However includes 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 #endif @@ -361,6 +374,19 @@ #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 which + * was included above. However includes 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 #endif @@ -373,6 +399,19 @@ #include #endif #if defined(HAVE_RPCSVC_YP_PROT_H) +/* + * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in which + * was included above. However includes 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 #endif #endif /* HAVE_NETGROUP */ -- cgit From 17f2560ce690d6ed2cb75d2442e3225a10f27d9c Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 8 Sep 2004 02:48:27 +0000 Subject: r2248: Merge of tridge's PRINTF_ATTRIBUTE fixes from samba4. (This used to be commit 53bfb76608efa347d5fe154c5583a5e8e3d53740) --- source3/include/includes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 56624e5198..58cb39790f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -45,10 +45,11 @@ #undef HAVE_TERMIOS_H #endif -#ifdef __GNUC__ +#if (__GNUC__ >= 3) /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first - * argument. **/ + * argument. Note that some gcc 2.x versions don't handle this + * properly **/ #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) #else #define PRINTF_ATTRIBUTE(a1, a2) -- cgit From ebc84c4efd2b97a16ee1a67a9811eb77fb85bb58 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 16 Sep 2004 02:49:01 +0000 Subject: r2364: Include yp_prot.h before ypclnt.h as AIX 5.2 spits the dummy otherwise. Bugzilla #1778. (This used to be commit 0f1ffe0f304d367fa5db1cfd92a8f5e365233c1f) --- source3/include/includes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 58cb39790f..3ea4eaa35a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -396,9 +396,6 @@ #endif #if defined (HAVE_NETGROUP) -#if defined(HAVE_RPCSVC_YPCLNT_H) -#include -#endif #if defined(HAVE_RPCSVC_YP_PROT_H) /* * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in which @@ -415,6 +412,9 @@ #endif #include #endif +#if defined(HAVE_RPCSVC_YPCLNT_H) +#include +#endif #endif /* HAVE_NETGROUP */ #if defined(HAVE_SYS_IPC_H) -- cgit From b4cf9e95059071df49b34ff8574e48cb96f42da1 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 7 Oct 2004 04:01:18 +0000 Subject: r2835: Since we always have -I. and -I$(srcdir) in CFLAGS, we can get rid of '..' from all #include preprocessor commands. This fixes bugzilla #1880 where OpenVMS gets confused about the '.' characters. (This used to be commit 7f161702fa4916979602cc0295919b541912acd6) --- source3/include/includes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3ea4eaa35a..d51e4c53f1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -793,9 +793,9 @@ extern int errno; #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" -#include "../tdb/tdb.h" -#include "../tdb/spinlock.h" -#include "../tdb/tdbutil.h" +#include "tdb/tdb.h" +#include "tdb/spinlock.h" +#include "tdb/tdbutil.h" #include "talloc.h" #include "nt_status.h" #include "ads.h" -- cgit From 7cb23bf74df9b7870dd7886d5a92da05339b923f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 1 Nov 2004 18:44:15 +0000 Subject: r3438: fix some kerberos-related prototype warnings Guenther (This used to be commit 43c8a9e25961f65677a55e701f54c0227329a756) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d51e4c53f1..9f3fcacc20 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1340,6 +1340,7 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); /* Samba wrapper function for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); +int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); @@ -1347,6 +1348,8 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype * void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); +krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype); + #endif /* HAVE_KRB5 */ -- cgit From c0e31dd4f53226386a3017c0a4f8401fab102851 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 3 Nov 2004 00:29:09 +0000 Subject: r3495: Fix the build (recent kerberos-changes). Guenther (This used to be commit c7eab285d967345510a15e83bce508edb8e06e99) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9f3fcacc20..3999ef48bd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1349,7 +1349,9 @@ void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype); - +void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype); +BOOL kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2); +void kerberos_free_data_contents(krb5_context context, krb5_data *pdata); #endif /* HAVE_KRB5 */ -- cgit From 8ea9237d82857ecd6111c37d1ce6b9122ff50f44 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 5 Nov 2004 00:57:29 +0000 Subject: r3538: Fix the build with the latest Heimdal code. Jeremy. (This used to be commit 34275bae787762646f02ea1dec19d7b3a9a733a3) --- source3/include/includes.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3999ef48bd..6a1681fe1f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -455,13 +455,9 @@ #if HAVE_GSSAPI_H #include -#endif - -#if HAVE_GSSAPI_GSSAPI_H +#elif HAVE_GSSAPI_GSSAPI_H #include -#endif - -#if HAVE_GSSAPI_GSSAPI_GENERIC_H +#elif HAVE_GSSAPI_GSSAPI_GENERIC_H #include #endif -- cgit From b5eeca9f7062164bc7f9761395823df3f584d136 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 15 Nov 2004 21:21:50 +0000 Subject: r3772: BUG 2006: patch from Michel Gravey ; fix build when using gcc 3.0 (This used to be commit 1bc79a28080f2ff783b49e5cf3adfdfc4a4940ee) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6a1681fe1f..ef0f761ff7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -45,7 +45,7 @@ #undef HAVE_TERMIOS_H #endif -#if (__GNUC__ >= 3) +#if (__GNUC__ >= 3 ) && (__GNUC_MINOR__ >= 1 ) /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first * argument. Note that some gcc 2.x versions don't handle this -- cgit From 92e97934804758e2fea2e3bd8f9e6630007c8169 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sun, 19 Dec 2004 00:31:31 +0000 Subject: r4268: Merge fix for bugzilla #2150. (This used to be commit f00ae4ab0c36a623257861fb65373b39cf075921) --- source3/include/includes.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ef0f761ff7..66ff4fa9f0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1202,15 +1202,6 @@ int vasprintf(char **ptr, const char *format, va_list ap); #define LOG_DEBUG 7 /* debug-level messages */ #endif -/* NetBSD doesn't have these */ -#ifndef SHM_R -#define SHM_R 0400 -#endif - -#ifndef SHM_W -#define SHM_W 0200 -#endif - #if HAVE_KERNEL_SHARE_MODES #ifndef LOCK_MAND #define LOCK_MAND 32 /* This is a mandatory flock */ -- cgit From d94d87472ca2f3875caa146424caa178ce20274f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 13 Jan 2005 18:20:37 +0000 Subject: r4724: Add support for Windows privileges in Samba 3.0 (based on Simo's code in trunk). Rewritten with the following changes: * privilege set is based on a 32-bit mask instead of strings (plans are to extend this to a 64 or 128-bit mask before the next 3.0.11preX release). * Remove the privilege code from the passdb API (replication to come later) * Only support the minimum amount of privileges that make sense. * Rewrite the domain join checks to use the SeMachineAccountPrivilege instead of the 'is a member of "Domain Admins"?' check that started all this. Still todo: * Utilize the SePrintOperatorPrivilege in addition to the 'printer admin' parameter * Utilize the SeAddUserPrivilege for adding users and groups * Fix some of the hard coded _lsa_*() calls * Start work on enough of SAM replication to get privileges from one Samba DC to another. * Come up with some management tool for manipultaing privileges instead of user manager since it is buggy when run on a 2k client (haven't tried xp). Works ok on NT4. (This used to be commit 77c10ff9aa6414a31eece6dfec00793f190a9d6c) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 66ff4fa9f0..45c7133f1e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -814,6 +814,8 @@ extern int errno; #include "version.h" +#include "privileges.h" + #include "smb.h" #include "nameserv.h" -- cgit From 96a3fede405cd095e353398ff05f4b43a07c457d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 23 Feb 2005 16:36:44 +0000 Subject: r5517: code cleanup; rename the sorted_tree to pathtree (used by registry code) I was going to use this for tracking dfs mounts in smbclient but found another way. Still the cleanup is valid so commiting it. should be minimally disruptive since it is not widely used. (This used to be commit 00738dca3b07083c91545910486a1f30f2b17281) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 45c7133f1e..982eee1886 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -802,7 +802,6 @@ extern int errno; #include "messages.h" #include "charset.h" #include "dynconfig.h" -#include "adt_tree.h" #include "util_getent.h" -- cgit From 9840db418bad5a39edc4a32a1786f5e2d2c9dff8 Mon Sep 17 00:00:00 2001 From: Derrell Lipman Date: Thu, 31 Mar 2005 05:06:04 +0000 Subject: r6149: Fixes bugs #2498 and 2484. 1. using smbc_getxattr() et al, one may now request all access control entities in the ACL without getting all other NT attributes. 2. added the ability to exclude specified attributes from the result set provided by smbc_getxattr() et al, when requesting all attributes, all NT attributes, or all DOS attributes. 3. eliminated all compiler warnings, including when --enable-developer compiler flags are in use. removed -Wcast-qual flag from list, as that is specifically to force warnings in the case of casting away qualifiers. Note: In the process of eliminating compiler warnings, a few nasties were discovered. In the file libads/sasl.c, PRIVATE kerberos interfaces are being used; and in libsmb/clikrb5.c, both PRIAVE and DEPRECATED kerberos interfaces are being used. Someone who knows kerberos should look at these and determine if there is an alternate method of accomplishing the task. (This used to be commit 994694f7f26da5099f071e1381271a70407f33bb) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 982eee1886..20f5304591 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1372,4 +1372,7 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); #undef HAVE_MMAP #endif +#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) +#define CONST_ADD(type, ptr) ((type) ((const void *) (ptr))) + #endif /* _INCLUDES_H */ -- cgit From 2c83fb4a06c916e9a68677089a1590a12a9a779f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sun, 10 Apr 2005 04:27:14 +0000 Subject: r6266: Add includes for sys/extattr.h and sys/uio.h for FreeBSD xattr code. Jeremy. (This used to be commit 695d45bcadbcc1528900255534be47f135160529) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 20f5304591..cf6f493dd6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -476,6 +476,14 @@ #include #endif +#ifdef HAVE_SYS_EXTATTR_H +#include +#endif + +#ifdef HAVE_SYS_UIO_H +#include +#endif + #if HAVE_LOCALE_H #include #endif -- cgit From 5a72f0da1dbf3c4d3055a9116d81448f0d540905 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Tue, 12 Apr 2005 18:59:49 +0000 Subject: r6318: don't include smbwrapper stuff unless asked for (This used to be commit ce38ead0fccf434f90671201d3c50cd79b3f3ed4) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index cf6f493dd6..a6db058708 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -864,7 +864,9 @@ extern int errno; #include "client.h" +#ifdef WITH_SMBWRAPPER #include "smbw.h" +#endif #include "session.h" -- cgit From 2d1e1f7e2e9a1bc30c12610462757fd422e7ffb4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 2 May 2005 10:12:36 +0000 Subject: r6570: Add socket_wrapper library to 3.0. Can be enabled by passing --enable-socket-wrapper to configure (This used to be commit 9c6cdd23ead427a4cb20177dad1c87da9594a4fe) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a6db058708..1fabe44e0e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -276,7 +276,6 @@ #include #endif - #ifdef HAVE_SYS_MOUNT_H #include #endif @@ -788,6 +787,11 @@ extern int errno; #define NGROUPS_MAX 32 /* Guess... */ #endif +#ifdef SOCKET_WRAPPER +#define SOCKET_WRAPPER_REPLACE +#include "include/socket_wrapper.h" +#endif + /* Our own pstrings and fstrings */ #include "pstring.h" -- cgit From bce78238fb84c201a9bdc6ee88a6ced38ee26768 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 7 May 2005 06:46:37 +0000 Subject: r6639: Attempt to fix the build with talloc Volker (This used to be commit f3836831da317660a3a1bb356d238f50320e1512) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1fabe44e0e..1f2aa8baf9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -804,6 +804,7 @@ extern int errno; #include "tdb/tdb.h" #include "tdb/spinlock.h" #include "tdb/tdbutil.h" +#define _SAMBA_BUILD_ 1 #include "talloc.h" #include "nt_status.h" #include "ads.h" -- cgit From 63dacdf65acb21fc4034072bda3795ffda13f4ac Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 7 May 2005 17:09:16 +0000 Subject: r6651: It's not the smartest thing in the world to #define _SAMBA_BUILD_ in a file that is only included if _SAMBA_BUILD_ is defined... Let's see how far this gets us. Volker (This used to be commit 563275b35f76107e3d2a8b0b6e14394b20ecd81b) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1f2aa8baf9..1fabe44e0e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -804,7 +804,6 @@ extern int errno; #include "tdb/tdb.h" #include "tdb/spinlock.h" #include "tdb/tdbutil.h" -#define _SAMBA_BUILD_ 1 #include "talloc.h" #include "nt_status.h" #include "ads.h" -- cgit From fed660877c16562265327c6093ea645cf4176b5c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 8 Jun 2005 22:10:34 +0000 Subject: r7415: * big change -- volker's new async winbindd from trunk (This used to be commit a0ac9a8ffd4af31a0ebc423b4acbb2f043d865b8) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1fabe44e0e..da4c98fc72 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -804,7 +804,12 @@ extern int errno; #include "tdb/tdb.h" #include "tdb/spinlock.h" #include "tdb/tdbutil.h" + #include "talloc.h" +/* And a little extension. Abort on type mismatch */ +#define talloc_get_type_abort(ptr, type) \ + (type *)talloc_check_name_abort(ptr, #type) + #include "nt_status.h" #include "ads.h" #include "interfaces.h" -- cgit From 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 24 Jun 2005 20:25:18 +0000 Subject: r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a) --- source3/include/includes.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index da4c98fc72..9ff87557ff 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -25,6 +25,17 @@ #include "config.h" #endif +#ifndef __cplusplus +#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#endif + #include "local.h" #ifdef AIX @@ -55,7 +66,7 @@ #define PRINTF_ATTRIBUTE(a1, a2) #endif -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__cplusplus) /** gcc attribute used on function parameters so that it does not emit * warnings about them being unused. **/ # define UNUSED(param) param __attribute__ ((unused)) -- cgit From b20239df942527c0cbf70d779df56a4a56518315 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 24 Jun 2005 21:18:20 +0000 Subject: r7886: Fix building with pam_smbpass. Jeremy. (This used to be commit 22a796fe012e212f7744f0d63a8512e6942a5324) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9ff87557ff..d35123dc73 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -29,6 +29,7 @@ #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -- cgit From 4a681680312f321f4e87597faf214cbe93532cb3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 27 Jun 2005 22:08:58 +0000 Subject: r7959: Added aio structure and types. Jeremy. (This used to be commit 095c5dbc188ca4b093c774c8f04d79f7d342a8a6) --- source3/include/includes.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d35123dc73..c091506381 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -503,6 +503,10 @@ #include #endif +#ifdef HAVE_AIO_H +#include +#endif + /* Special macros that are no-ops except when run under Valgrind on * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ #if HAVE_VALGRIND_MEMCHECK_H @@ -772,6 +776,29 @@ typedef int socklen_t; # endif #endif +/* + * Type for aiocb structure. + */ + +#ifndef SMB_STRUCT_AIOCB +# if defined(WITH_AIO) +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_AIOCB64) +# define SMB_STRUCT_AIOCB struct aiocb64 +# else +# define SMB_STRUCT_AIOCB struct aiocb +# endif +# else +# define SMB_STRUCT_AIOCB int /* AIO not being used but we still need the define.... */ +# endif +#endif + +#ifndef HAVE_STRUCT_TIMESPEC +struct timespec { + time_t tv_sec; /* Seconds. */ + long tv_nsec; /* Nanoseconds. */ +}; +#endif + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -- cgit From f5bf5765af07f04ff6fcf5615c2e09fc468aff5f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 15 Jul 2005 21:36:00 +0000 Subject: r8510: Don't include the valgrind headers on 64bit linux systems. Several incarnations of gcc bork with Compiling dynconfig.c /tmp/ccXd94O5.s: Assembler messages: /tmp/ccXd94O5.s:1202: Error: suffix or operands invalid for `mov' /tmp/ccXd94O5.s:1289: Error: suffix or operands invalid for `mov'` Thanks to Bent Vangli for the the leg work and suggestions. (This used to be commit 318fe7ba0093c4a94e9f4f5c8ce7a2f5d1078e26) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c091506381..6cab2525b0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -507,6 +507,8 @@ #include #endif +/* skip valgrind headers on 64bit AMD boxes */ +#ifndef HAVE_64BIT_LINUX /* Special macros that are no-ops except when run under Valgrind on * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ #if HAVE_VALGRIND_MEMCHECK_H @@ -515,6 +517,7 @@ #elif HAVE_VALGRIND_H #include #endif +#endif /* If we have --enable-developer and the valgrind header is present, * then we're OK to use it. Set a macro so this logic can be done only -- cgit From f98f86394a654722fa13ef1dc3c4dea82d452442 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 22 Aug 2005 18:03:08 +0000 Subject: r9483: Changed DIR to SMB_STRUCT_DIR because of the amazing stupidity of a UNIX vendor not understanding abstract data types :-(. Jeremy. (This used to be commit be5b4e2fa3ed30b0ff01b47d2354e5f782a12e25) --- source3/include/includes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6cab2525b0..c9208d2b25 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -743,6 +743,18 @@ typedef int socklen_t; # endif #endif +/* + * Type for DIR structure. + */ + +#ifndef SMB_STRUCT_DIR +# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_DIR64) +# define SMB_STRUCT_DIR DIR64 +# else +# define SMB_STRUCT_DIR DIR +# endif +#endif + /* * Defines for 64 bit fcntl locks. */ -- cgit From 52188859e77d431302377849c8e26b0b46bba73f Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 26 Aug 2005 03:23:48 +0000 Subject: r9627: Enable format string checking for the MIPSPro compilers. (This used to be commit 5396944fc3799a9746d00167a6f0e8465df4dcea) --- source3/include/includes.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c9208d2b25..51aa218ac6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1323,13 +1323,18 @@ extern int DEBUGLEVEL; #endif /* add varargs prototypes with printf checking */ +/*PRINTFLIKE2 */ int fdprintf(int , const char *, ...) PRINTF_ATTRIBUTE(2,3); +/*PRINTFLIKE1 */ int d_printf(const char *, ...) PRINTF_ATTRIBUTE(1,2); +/*PRINTFLIKE2 */ int d_fprintf(FILE *f, const char *, ...) PRINTF_ATTRIBUTE(2,3); #ifndef HAVE_SNPRINTF_DECL +/*PRINTFLIKE3 */ int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); #endif #ifndef HAVE_ASPRINTF_DECL +/*PRINTFLIKE2 */ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif @@ -1340,11 +1345,19 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) #define snprintf smb_snprintf #define vsnprintf smb_vsnprintf + +/* PRINTFLIKE3 */ +int smb_snprintf(char *str,size_t count,const char *fmt,...); +int smb_vsnprintf (char *str, size_t count, const char *fmt, va_list args); + #endif +/* PRINTFLIKE2 */ void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); +/* PRINTFLIKE2 */ int pstr_sprintf(pstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); +/* PRINTFLIKE2 */ int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); @@ -1356,7 +1369,6 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE( #define slprintf snprintf #define vslprintf vsnprintf - /* we need to use __va_copy() on some platforms */ #ifdef HAVE_VA_COPY #define VA_COPY(dest, src) va_copy(dest, src) -- cgit From 54abd2aa66069e6baf7769c496f46d9dba18db39 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 30 Sep 2005 17:13:37 +0000 Subject: r10656: BIG merge from trunk. Features not copied over * \PIPE\unixinfo * winbindd's {group,alias}membership new functions * winbindd's lookupsids() functionality * swat (trunk changes to be reverted as per discussion with Deryck) (This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3) --- source3/include/includes.h | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 51aa218ac6..573982903b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -27,7 +27,8 @@ #ifndef __cplusplus #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES +/* allow to build with newer heimdal releases */ +/* #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */ #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES @@ -288,6 +289,7 @@ #include #endif + #ifdef HAVE_SYS_MOUNT_H #include #endif @@ -896,19 +898,17 @@ extern int errno; #include "privileges.h" -#include "rpc_creds.h" +#include "rpc_misc.h" + +#include "rpc_dce.h" #include "mapping.h" #include "passdb.h" -#include "ntdomain.h" - -#include "rpc_misc.h" - #include "rpc_secdes.h" -#include "nt_printing.h" +#include "authdata.h" #include "msdfs.h" @@ -923,6 +923,29 @@ extern int errno; #include "auth.h" +#include "ntdomain.h" + +#include "rpc_svcctl.h" +#include "rpc_ntsvcs.h" +#include "rpc_lsa.h" +#include "rpc_netlogon.h" +#include "reg_objects.h" +#include "rpc_reg.h" +#include "rpc_samr.h" +#include "rpc_srvsvc.h" +#include "rpc_wkssvc.h" +#include "rpc_spoolss.h" +#include "rpc_eventlog.h" +#include "rpc_dfs.h" +#include "rpc_ds.h" +#include "rpc_echo.h" +#include "rpc_shutdown.h" +#include "rpc_unixinfo.h" +#include "rpc_perfcount.h" +#include "rpc_perfcount_defs.h" + +#include "nt_printing.h" + #include "idmap.h" #include "client.h" @@ -945,6 +968,8 @@ extern int errno; #include "spnego.h" +#include "rpc_client.h" + /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. @@ -995,6 +1020,8 @@ struct smb_ldap_privates; #include "smbldap.h" +#include "smb_ldap.h" + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" @@ -1414,7 +1441,7 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); -void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); +BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); -- cgit From a8efd337dab7a3164407f817d5a61804f2092507 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 30 Sep 2005 17:23:18 +0000 Subject: r10657: remove missing header file (This used to be commit 85e61ff69c92143f54860dfce02f95a1e6070bc3) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 573982903b..74156c6a6d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -940,7 +940,6 @@ extern int errno; #include "rpc_ds.h" #include "rpc_echo.h" #include "rpc_shutdown.h" -#include "rpc_unixinfo.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" -- cgit From aa0dff680d2ea351a0a21cb86a51cd99887237c4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 1 Oct 2005 09:43:53 +0000 Subject: r10671: Attempt to fix the build on machines without kerberos headers. Volker (This used to be commit cb816e65a95802d5172c410d1acda2da070b871d) --- source3/include/includes.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 74156c6a6d..2f04e27a2a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1451,6 +1451,44 @@ krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, kr void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype); BOOL kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2); void kerberos_free_data_contents(krb5_context context, krb5_data *pdata); +NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx, + DATA_BLOB *pac_data_blob, + krb5_context context, + krb5_keyblock *service_keyblock, + krb5_const_principal client_principal, + time_t tgs_authtime, + PAC_DATA **pac_data); +void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum, + PAC_SIGNATURE_DATA *sig); +krb5_error_code smb_krb5_verify_checksum(krb5_context context, + krb5_keyblock *keyblock, + krb5_keyusage usage, + krb5_checksum *cksum, + uint8 *data, + size_t length); +time_t get_authtime_from_tkt(krb5_ticket *tkt); +void smb_krb5_free_ap_req(krb5_context context, + krb5_ap_req *ap_req); +krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context, + const krb5_data *inbuf, + krb5_kvno *kvno, + krb5_enctype *enctype); +krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context, + krb5_auth_context *auth_context, + const krb5_data *inbuf, + krb5_const_principal server, + krb5_keytab keytab, + krb5_flags *ap_req_options, + krb5_ticket **ticket, + krb5_keyblock **keyblock); +krb5_error_code smb_krb5_parse_name_norealm(krb5_context context, + const char *name, + krb5_principal *principal); +BOOL smb_krb5_principal_compare_any_realm(krb5_context context, + krb5_const_principal princ1, + krb5_const_principal princ2); +int cli_krb5_get_ticket(const char *principal, time_t time_offset, + DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts); #endif /* HAVE_KRB5 */ -- cgit From ad7cd4096f73382f3723fb3f4581c6cea4186702 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 20 Oct 2005 08:13:00 +0000 Subject: r11213: Fix the build Guenther (This used to be commit 908ac0c9eccd1ba368a6305fee9673770fc74a53) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2f04e27a2a..626124523e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1489,6 +1489,7 @@ BOOL smb_krb5_principal_compare_any_realm(krb5_context context, krb5_const_principal princ2); int cli_krb5_get_ticket(const char *principal, time_t time_offset, DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts); +PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); #endif /* HAVE_KRB5 */ -- cgit From ac331c48db29afeb712bb1a1edf739354082ad7f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 22 Nov 2005 17:15:28 +0000 Subject: r11863: BUG 3196: patch from Alex Deiter to compile against the Sun LDAP client libs. But not for AD support; just ldap support (This used to be commit a33e78acedb37df47905d326411e017794721250) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 626124523e..cde199eed8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -458,10 +458,19 @@ #if HAVE_LBER_H #include +#ifndef LBER_USE_DER +#define LBER_USE_DER 0x01 +#endif #endif #if HAVE_LDAP_H #include +#ifndef LDAP_CONST +#define LDAP_CONST const +#endif +#ifndef LDAP_OPT_SUCCESS +#define LDAP_OPT_SUCCESS 0 +#endif #else #undef HAVE_LDAP #endif -- cgit From 83b987befdbba857131102700d237728784b6f69 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 6 Dec 2005 23:06:38 +0000 Subject: r12107: Move to a tdb-based wins database. At the moment we still use it as though it were an in-memory db and dump out to a flat file every 2 mins, but that can now change. Jeremy. (This used to be commit a342681792724c1ae8561ba8d352c4ee6e2a5332) --- source3/include/includes.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index cde199eed8..80fc3feed9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -863,8 +863,6 @@ extern int errno; /* Lists, trees, caching, database... */ #include "xfile.h" #include "intl.h" -#include "ubi_sLinkList.h" -#include "ubi_dLinkList.h" #include "dlinklist.h" #include "tdb/tdb.h" #include "tdb/spinlock.h" @@ -887,10 +885,6 @@ extern int errno; #include "util_getent.h" -#ifndef UBI_BINTREE_H -#include "ubi_Cache.h" -#endif /* UBI_BINTREE_H */ - #include "debugparse.h" #include "version.h" -- cgit From cc589241794088a51838aef3e62a3a0477041e27 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Jan 2006 15:31:25 +0000 Subject: r12771: Apply patch from bug 3374, attempt to fix build on tru64. Thanks to "The Written Word" -- whoever that is :-) Volker (This used to be commit 7d0956f0bd28728fbb8b4c24c4ed3cdcc04e2daf) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 80fc3feed9..f704fcb687 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -565,6 +565,7 @@ typedef int VOLATILE SIG_ATOMIC_T; #endif #ifndef HAVE_SOCKLEN_T_TYPE +#define HAVE_SOCKLEN_T_TYPE typedef int socklen_t; #endif -- cgit From fbbe89ea30b8303787b22ed267dac14d27efdfbb Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 9 Jan 2006 15:54:16 +0000 Subject: r12794: BUG 3340: patch from William JoJo to fix automatic inclusion of aio support on AIX (This used to be commit f19f7961eef9d9fe345279c5ab35d18dff14e5ea) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f704fcb687..44b5ea1bd7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -514,7 +514,7 @@ #include #endif -#ifdef HAVE_AIO_H +#if defined(HAVE_AIO_H) && defined(WITH_AIO) #include #endif -- cgit From 33174847994128387a36a8103f147fe5a96c15fd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 12 Jan 2006 22:17:54 +0000 Subject: r12877: Stop passing structs around in smb messages, instead always linearize into little-endian. Should fix all Solaris issues with this, plus provide a cleaner base moving forward for cluster-aware Samba where smbd's can communicate across different compilers/architectures (eventually these message will have to go cross-machine). Jeremy. (This used to be commit d01824b78576a034428e1cef73868d1169057991) --- source3/include/includes.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 44b5ea1bd7..a9b792d5f6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -657,6 +657,20 @@ typedef int socklen_t; # endif #endif +#ifndef LARGE_SMB_DEV_T +# if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_DEV64_T)) || (defined(SIZEOF_DEV_T) && (SIZEOF_DEV_T == 8)) +# define LARGE_SMB_DEV_T 1 +# endif +#endif + +#ifdef LARGE_SMB_DEV_T +#define SDEV_T_VAL(p, ofs, v) (SIVAL((p),(ofs),(v)&0xFFFFFFFF), SIVAL((p),(ofs)+4,(v)>>32)) +#define DEV_T_VAL(p, ofs) ((SMB_DEV_T)(((SMB_BIG_UINT)(IVAL((p),(ofs))))| (((SMB_BIG_UINT)(IVAL((p),(ofs)+4))) << 32))) +#else +#define SDEV_T_VAL(p, ofs, v) (SIVAL((p),(ofs),v),SIVAL((p),(ofs)+4,0)) +#define DEV_T_VAL(p, ofs) ((SMB_DEV_T)(IVAL((p),(ofs)))) +#endif + /* * Setup the correctly sized inode type. */ @@ -676,9 +690,11 @@ typedef int socklen_t; #endif #ifdef LARGE_SMB_INO_T -#define SINO_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) +#define SINO_T_VAL(p, ofs, v) (SIVAL((p),(ofs),(v)&0xFFFFFFFF), SIVAL((p),(ofs)+4,(v)>>32)) +#define INO_T_VAL(p, ofs) ((SMB_INO_T)(((SMB_BIG_UINT)(IVAL(p,ofs)))| (((SMB_BIG_UINT)(IVAL(p,(ofs)+4))) << 32))) #else -#define SINO_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#define SINO_T_VAL(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#define INO_T_VAL(p, ofs) ((SMB_INO_T)(IVAL((p),(ofs)))) #endif #ifndef SMB_OFF_T -- cgit From 0af1500fc0bafe61019f1b2ab1d9e1d369221240 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 3 Feb 2006 22:19:41 +0000 Subject: r13316: Let the carnage begin.... Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f) --- source3/include/includes.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a9b792d5f6..8aa1003240 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -989,6 +989,8 @@ extern int errno; #include "rpc_client.h" +#include "event.h" + /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. @@ -1018,6 +1020,11 @@ struct functable { int (*fn)(int argc, const char **argv); }; +struct functable2 { + const char *funcname; + int (*fn)(int argc, const char **argv); + const char *helptext; +}; /* Defines for wisXXX functions. */ #define UNI_UPPER 0x1 @@ -1508,8 +1515,10 @@ BOOL smb_krb5_principal_compare_any_realm(krb5_context context, krb5_const_principal princ1, krb5_const_principal princ2); int cli_krb5_get_ticket(const char *principal, time_t time_offset, - DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts); + DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname); PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); +krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *new_start_time); +krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code); #endif /* HAVE_KRB5 */ -- cgit From 65a2800734264d9aeb013faccf309ca044134580 Mon Sep 17 00:00:00 2001 From: James Peach Date: Mon, 6 Feb 2006 06:22:20 +0000 Subject: r13364: Continue not enabling valgrind on 64-bit Linux (see also rev 8510). (This used to be commit 13766b03e806528cdd34c9452f42ae4e71869671) --- source3/include/includes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8aa1003240..7e519aadc1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -533,9 +533,11 @@ /* If we have --enable-developer and the valgrind header is present, * then we're OK to use it. Set a macro so this logic can be done only * once. */ -#if defined(DEVELOPER) && (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) +#if defined(DEVELOPER) && !defined(HAVE_64BIT_LINUX) +#if (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) #define VALGRIND #endif +#endif /* we support ADS if we want it and have krb5 and ldap libs */ -- cgit From 2cf38b62c5d0169385dd9ddc76d9619c14cbbf13 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 20 Feb 2006 11:57:47 +0000 Subject: r13566: Fix EA support for AIX. Patch from Bjoern Jacke . Guenther (This used to be commit 69fb189a6b9947069afebb15d6ee6f2f20d15171) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7e519aadc1..0dbcb69286 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -498,6 +498,10 @@ #include #endif +#ifdef HAVE_SYS_EA_H +#include +#endif + #ifdef HAVE_SYS_EXTATTR_H #include #endif -- cgit From 8176d4c9fe67701c7f2a71d6911961e16d843e1a Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Tue, 21 Feb 2006 17:35:52 +0000 Subject: r13598: Defining KRB5KRB_ERR_RESPONSE_TOO_BIG if not defined which is the case for older krb5 implementations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch slightly modified from the version provided by Björn Jacke at the samba-technical list after discussion on the list and by IRC. Thanks Björn! (This used to be commit 49e6431c06c70088907c31e2da1ec83a09377015) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0dbcb69286..210c0040b5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1453,6 +1453,10 @@ time_t timegm(struct tm *tm); #if defined(HAVE_KRB5) +#ifndef KRB5KRB_ERR_RESPONSE_TOO_BIG +#define KRB5KRB_ERR_RESPONSE_TOO_BIG (-1765328332L) +#endif + #ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif -- cgit From 2a0ad559ad9cfdddfff347e2542ee50594435eee Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 22 Feb 2006 11:47:41 +0000 Subject: r13625: Now that Heimdal 0.7.2 is released, we reenable our strict checking for c++ reserved names. Guenther (This used to be commit e0b50d008728cfc66f6b1eefdadf8a708f4d9500) --- source3/include/includes.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 210c0040b5..407c68b4c3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -27,8 +27,7 @@ #ifndef __cplusplus #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -/* allow to build with newer heimdal releases */ -/* #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */ +#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -- cgit From 52576153670f79014992020cb5179cc51ee0a6b9 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 26 Feb 2006 01:41:02 +0000 Subject: r13690: Check in Björn's LDAP Solaris fix. (This used to be commit d6c6363517513cc66a8933a6e4f95c5ce5cf1cb4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 407c68b4c3..372744c8ea 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -470,6 +470,10 @@ #ifndef LDAP_OPT_SUCCESS #define LDAP_OPT_SUCCESS 0 #endif +/* Solaris 8 and maybe other LDAP implementations spell this "..._INPROGRESS": */ +#if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS) +#define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS +#endif #else #undef HAVE_LDAP #endif -- cgit From 9fffb6ab5b9eebdc3173ad63b90aec974f18ab53 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 26 Feb 2006 12:25:34 +0000 Subject: r13693: More Solaris/LDAP fixes from Bjoern (This used to be commit 7c098ca0ae4c7e11c7100fb09b42ce716beffb56) --- source3/include/includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 372744c8ea..aef3437d56 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -474,6 +474,12 @@ #if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS) #define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS #endif +/* Solaris 8 defines SSL_LDAP_PORT, not LDAPS_PORT and it only does so if + LDAP_SSL is defined - but SSL is not working. We just want the + port number! Let's just define LDAPS_PORT correct. */ +#if !defined(LDAPS_PORT) +#define LDAPS_PORT 636 +#endif #else #undef HAVE_LDAP #endif -- cgit From e11a85eebd660073f3f68b7d6d289476e5193d28 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 9 Mar 2006 14:51:40 +0000 Subject: r14074: Some cleanup; there is no point in declaring and mapping KRB5KRB_ERR_RESPONSE_TOO_BIG when the krb5 library does not know about this. Guenther (This used to be commit 4a1a3c4808307e09fa8ff85da9a963a4a6f0e9ae) --- source3/include/includes.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index aef3437d56..4bd84c877a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1462,10 +1462,6 @@ time_t timegm(struct tm *tm); #if defined(HAVE_KRB5) -#ifndef KRB5KRB_ERR_RESPONSE_TOO_BIG -#define KRB5KRB_ERR_RESPONSE_TOO_BIG (-1765328332L) -#endif - #ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif @@ -1538,6 +1534,8 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset, PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *new_start_time); krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code); +NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error); +krb5_error_code nt_status_to_krb5(NTSTATUS nt_status); #endif /* HAVE_KRB5 */ -- cgit From 97ee5b1afa342eea40f973f5370c9f620c63bd01 Mon Sep 17 00:00:00 2001 From: James Peach Date: Tue, 21 Mar 2006 02:56:49 +0000 Subject: r14600: Refactor capability interface from being IRIX-specific to using only the POSIX interface. Note that this removes support for inherited capabilities. This wasn't used, and probably should not be. (This used to be commit 763f4c01488a96aec000c18bca313da37ed1df1b) --- source3/include/includes.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4bd84c877a..9f6f8b2471 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -362,24 +362,6 @@ #include #endif -#ifdef HAVE_SYS_CAPABILITY_H - -#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) && !defined(_PPC_STATFS_H) -#define _I386_STATFS_H -#define _PPC_STATFS_H -#define BROKEN_REDHAT_7_STATFS_WORKAROUND -#endif - -#include - -#ifdef BROKEN_REDHAT_7_STATFS_WORKAROUND -#undef _I386_STATFS_H -#undef _PPC_STATFS_H -#undef BROKEN_REDHAT_7_STATFS_WORKAROUND -#endif - -#endif - #if defined(HAVE_RPC_RPC_H) /* * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h. -- cgit From 80afbe5cf5f30e0f3116f99fc44c930f2cd60935 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 28 Mar 2006 15:50:13 +0000 Subject: r14751: Use the noreturn attribute to try and tell coverity that smb_panic can't return. Jeremy. (This used to be commit ba9c98983efbf4871e1ec07df37590d97ec52fba) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9f6f8b2471..e02a981d56 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1553,4 +1553,13 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); #define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) #define CONST_ADD(type, ptr) ((type) ((const void *) (ptr))) +#ifndef NORETURN_ATTRIBUTE +#if (__GNUC__ >= 3) +#define NORETURN_ATTRIBUTE __attribute__ ((noreturn)) +#else +#define NORETURN_ATTRIBUTE +#endif +#endif + +void smb_panic( const char *why ) NORETURN_ATTRIBUTE ; #endif /* _INCLUDES_H */ -- cgit From ecc0c18889cb3d844310fb91130680df22663a31 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 1 Apr 2006 05:41:34 +0000 Subject: r14847: Tell static checkers that exit_server() doesn't return. Jeremy. (This used to be commit 9c5e26a56aaaf1143b43e61d208ddaeb96f2ffcb) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e02a981d56..620af59db7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1562,4 +1562,5 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); #endif void smb_panic( const char *why ) NORETURN_ATTRIBUTE ; +void exit_server(const char *reason) NORETURN_ATTRIBUTE ; #endif /* _INCLUDES_H */ -- cgit From 4fa555980070d78b39711ef21d77628d26055bc2 Mon Sep 17 00:00:00 2001 From: James Peach Date: Tue, 4 Apr 2006 00:27:50 +0000 Subject: r14898: This change is an attempt to improve the quality of the information that is produced when a process exits abnormally. First, we coalesce the core dumping code so that we greatly improve our odds of being able to produce a core file, even in the case of a memory fault. I've removed duplicates of dump_core() and split it in two to reduce the amount of work needed to actually do the dump. Second, we refactor the exit_server code path to always log an explanation and a stack trace. My goal is to always produce enough log information for us to be able to explain any server exit, though there is a risk that this could produce too much log information on a flaky network. Finally, smbcontrol has gained a smbd fault injection operation to test the changes above. This is only enabled for developer builds. (This used to be commit 56bc02d64498eb3faf89f0c5452b9299daea8e95) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 620af59db7..7702b6645e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1562,5 +1562,9 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); #endif void smb_panic( const char *why ) NORETURN_ATTRIBUTE ; -void exit_server(const char *reason) NORETURN_ATTRIBUTE ; +void dump_core(void) NORETURN_ATTRIBUTE ; +void exit_server(const char *const reason) NORETURN_ATTRIBUTE ; +void exit_server_cleanly(void) NORETURN_ATTRIBUTE ; +void exit_server_fault(void) NORETURN_ATTRIBUTE ; + #endif /* _INCLUDES_H */ -- cgit From eecdc6c956d983be2c139843e2730136d3273fe9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 10 Apr 2006 22:47:09 +0000 Subject: r15022: Fix core dumps on normal server exit. Jeremy. (This used to be commit 13c3abf03187f84874b5754b54de5d3fe2dea188) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7702b6645e..c83b707887 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1564,7 +1564,7 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); void smb_panic( const char *why ) NORETURN_ATTRIBUTE ; void dump_core(void) NORETURN_ATTRIBUTE ; void exit_server(const char *const reason) NORETURN_ATTRIBUTE ; -void exit_server_cleanly(void) NORETURN_ATTRIBUTE ; +void exit_server_cleanly(const char *const reason) NORETURN_ATTRIBUTE ; void exit_server_fault(void) NORETURN_ATTRIBUTE ; #endif /* _INCLUDES_H */ -- cgit From 7a5ff0885d08f9e32dc9939e5fd676a987b881d9 Mon Sep 17 00:00:00 2001 From: James Peach Date: Wed, 12 Apr 2006 00:07:40 +0000 Subject: r15047: Add support for using libunwind to generate a backtrace. This is primarily intended for ia64 systems where libunwind knows more about the different ways of walking the stack that just about anything else. (This used to be commit 256a19d722f360dac3c8e83f5bfac453fa70db96) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c83b707887..b96bd19fd8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -358,10 +358,6 @@ #include #endif -#ifdef HAVE_EXECINFO_H -#include -#endif - #if defined(HAVE_RPC_RPC_H) /* * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h. -- cgit From 8c9eb7631eecbe3f9bda30aff4b5d97d5e2a8737 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 12 Apr 2006 14:10:39 +0000 Subject: r15053: fix portabilities issues between 32-bit winbind clients and a 64-bit winbindd server (This used to be commit a95d11345e76948b147bbc1f29a05c978d99a47a) --- source3/include/includes.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b96bd19fd8..1e59f50008 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -638,6 +638,19 @@ typedef int socklen_t; #endif #endif +/* + * check for 8 byte long long + */ + +#if !defined(uint64) +#if (SIZEOF_LONG == 8) +#define uint64 unsigned long +#elif (SIZEOF_LONG_LONG == 8) +#define uint64 unsigned long long +#endif /* don't lie. If we don't have it, then don't use it */ +#endif + + /* * Types for devices, inodes and offsets. */ -- cgit From 9de61b560ab6df0ed6ce99c8267fafbde9b00045 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 13 Apr 2006 12:03:12 +0000 Subject: r15072: Last bit of 32/64 bit portabilities fixes for winbind clients and aservers. Strange compiler-fu on 64-bit SLES9 says sizeof(time_t) == 4 but the memory alignment is on 8 bytes. Change time_t to uint32 to fix alignment. Remove 'char **gr_mem' from struct winbindd_gr since it was not being used. (This used to be commit b68e66d5c4f7348e674b8a009656ebfbbc06e288) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1e59f50008..a5f261282c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -21,6 +21,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* work around broken krb5.h on sles9 */ +#ifdef SIZEOF_LONG +#undef SIZEOF_LONG +#endif + #ifndef NO_CONFIG_H /* for some tests */ #include "config.h" #endif -- cgit From ba52fd71dc6b4dcf42a0c2de5b2f1e1e316b1da4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 24 Apr 2006 16:29:55 +0000 Subject: r15216: Fix the build for machines without krb5. Oops, sorry. Jeremy. (This used to be commit bea87e2df45c67cc75d91bd3ed1acc4c64a1c8ea) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a5f261282c..944d1b43c0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1458,6 +1458,14 @@ time_t timegm(struct tm *tm); #if defined(HAVE_KRB5) +krb5_error_code smb_krb5_parse_name(krb5_context context, + const char *name, /* in unix charset */ + krb5_principal *principal); + +krb5_error_code smb_krb5_unparse_name(krb5_context context, + krb5_const_principal principal, + char **unix_name); + #ifndef HAVE_KRB5_SET_REAL_TIME krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif -- cgit From 351e749246a278b60a7e18c1eeafdc8ec70efea2 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 25 Apr 2006 12:24:25 +0000 Subject: r15240: Correctly disallow unauthorized access when logging on with the kerberized pam_winbind and workstation restrictions are in effect. The krb5 AS-REQ needs to add the host netbios-name in the address-list. We don't get the clear NT_STATUS_INVALID_WORKSTATION code back yet from the edata of the KRB_ERROR but the login at least fails when the local machine is not in the workstation list on the DC. Guenther (This used to be commit 8b2ba11508e2730aba074d7c095291fac2a62176) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 944d1b43c0..0eb2ba83aa 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1538,6 +1538,8 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset, PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *new_start_time); krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code); +krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr); +krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr); NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error); krb5_error_code nt_status_to_krb5(NTSTATUS nt_status); #endif /* HAVE_KRB5 */ -- cgit From 4d55a81958a67d5da3227d7af79a5c630f678424 Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 5 May 2006 07:15:45 +0000 Subject: r15450: Change profiling data macros to use stack variables rather than globals. This catches mismatched start/end calls and removes the need for special nested profiling calls. (This used to be commit ee750498812190edd3ec52ca3c750258f3b8a97a) --- source3/include/includes.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0eb2ba83aa..3aec0f602a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -943,8 +943,6 @@ extern int errno; #include "msdfs.h" -#include "smbprofile.h" - #include "rap.h" #include "md5.h" @@ -1059,11 +1057,30 @@ struct smb_ldap_privates; #include "smb_ldap.h" +/* + * Reasons for cache flush. + */ + +enum flush_reason_enum { + SEEK_FLUSH, + READ_FLUSH, + WRITE_FLUSH, + READRAW_FLUSH, + OPLOCK_RELEASE_FLUSH, + CLOSE_FLUSH, + SYNC_FLUSH, + SIZECHANGE_FLUSH, + /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */ + NUM_FLUSH_REASONS}; + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" #endif +/* We need this after proto.h to reference GetTimeOfDay(). */ +#include "smbprofile.h" + /* String routines */ #include "srvstr.h" -- cgit From af086da4ec19de83717820de85d8e672850ed4b2 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 5 May 2006 19:24:48 +0000 Subject: r15462: replace the use of OpenLDAP's ldap_domain2hostlist() for locating AD DC's with out own DNS SRV queries. Testing on Linux and Solaris. (This used to be commit cf71f88a3cdcabf99c0798ef4cf8c978397a57eb) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3aec0f602a..998a0715e2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -903,6 +903,7 @@ extern int errno; #include "nt_status.h" #include "ads.h" +#include "ads_dns.h" #include "interfaces.h" #include "trans2.h" #include "nterr.h" -- cgit From 2c029a8b96ae476f1d5c2abe14ee25f98a1513d8 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 12 May 2006 15:17:35 +0000 Subject: r15543: New implementation of 'net ads join' to be more like Windows XP. The motivating factor is to not require more privileges for the user account than Windows does when joining a domain. The points of interest are * net_ads_join() uses same rpc mechanisms as net_rpc_join() * Enable CLDAP queries for filling in the majority of the ADS_STRUCT->config information * Remove ldap_initialized() from sam/idmap_ad.c and libads/ldap.c * Remove some unnecessary fields from ADS_STRUCT * Manually set the dNSHostName and servicePrincipalName attribute using the machine account after the join Thanks to Guenther and Simo for the review. Still to do: * Fix the userAccountControl for DES only systems * Set the userPrincipalName in order to support things like 'kinit -k' (although we might be able to just use the sAMAccountName instead) * Re-add support for pre-creating the machine account in a specific OU (This used to be commit 4c4ea7b20f44cd200cef8c7b389d51b72eccc39b) --- source3/include/includes.h | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 998a0715e2..a13cffea14 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -911,50 +911,29 @@ extern int errno; #include "messages.h" #include "charset.h" #include "dynconfig.h" - #include "util_getent.h" - #include "debugparse.h" - #include "version.h" - #include "privileges.h" - #include "smb.h" - +#include "ads_cldap.h" #include "nameserv.h" - #include "secrets.h" - #include "byteorder.h" - #include "privileges.h" - #include "rpc_misc.h" - #include "rpc_dce.h" - #include "mapping.h" - #include "passdb.h" - #include "rpc_secdes.h" - #include "authdata.h" - #include "msdfs.h" - #include "rap.h" - #include "md5.h" #include "hmacmd5.h" - #include "ntlmssp.h" - #include "auth.h" - #include "ntdomain.h" - #include "rpc_svcctl.h" #include "rpc_ntsvcs.h" #include "rpc_lsa.h" @@ -972,11 +951,8 @@ extern int errno; #include "rpc_shutdown.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" - #include "nt_printing.h" - #include "idmap.h" - #include "client.h" #ifdef WITH_SMBWRAPPER @@ -984,21 +960,13 @@ extern int errno; #endif #include "session.h" - #include "asn_1.h" - #include "popt.h" - #include "mangle.h" - #include "module.h" - #include "nsswitch/winbind_client.h" - #include "spnego.h" - #include "rpc_client.h" - #include "event.h" /* -- cgit From 5255388e958573feb9121bd5ed934739a1f43306 Mon Sep 17 00:00:00 2001 From: Paul Green Date: Tue, 16 May 2006 17:02:26 +0000 Subject: r15644: Now that we are referencing uint32_t and other data types defined in , ensure that it is present. (Not all implementations pull it in when is used). Paul (This used to be commit dafe36ec4cff4e5f94e35841966007e3e4758582) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a13cffea14..a74ca7084d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -93,6 +93,10 @@ #include +#ifdef HAVE_STDINT_H +#include +#endif + #ifdef TIME_WITH_SYS_TIME #include #include -- cgit From 5b558868551076cd03de4c634ce9fe74e46060df Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 24 May 2006 14:26:34 +0000 Subject: r15863: trying to fix a compile issue on HP-UX 11.x caused by conflicts of int16 and int32 definitions in internal and system headers (This used to be commit 094443ed6c0fdd06f459211dbca50feed58463ef) --- source3/include/includes.h | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a74ca7084d..b9267a7d83 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -596,11 +596,13 @@ typedef int socklen_t; #endif #if !defined(int16) && !defined(HAVE_INT16_FROM_RPC_RPC_H) -#if (SIZEOF_SHORT == 4) -#define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; -#else /* SIZEOF_SHORT != 4 */ -#define int16 short -#endif /* SIZEOF_SHORT != 4 */ +# if (SIZEOF_SHORT == 4) +# define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; +# else /* SIZEOF_SHORT != 4 */ +# define int16 short +# endif /* SIZEOF_SHORT != 4 */ + /* needed to work around compile issue on HP-UX 11.x */ +# define _INT16 1 #endif /* @@ -617,16 +619,18 @@ typedef int socklen_t; #endif #if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H) -#if (SIZEOF_INT == 4) -#define int32 int -#elif (SIZEOF_LONG == 4) -#define int32 long -#elif (SIZEOF_SHORT == 4) -#define int32 short -#else -/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ -#define int32 int -#endif +# if (SIZEOF_INT == 4) +# define int32 int +# elif (SIZEOF_LONG == 4) +# define int32 long +# elif (SIZEOF_SHORT == 4) +# define int32 short +# else + /* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */ +# define int32 int +# endif + /* needed to work around compile issue on HP-UX 11.x */ +# define _INT32 1 #endif /* -- cgit From 4347799f26004de07dffd617eddfb3989af5c24b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 24 May 2006 14:38:11 +0000 Subject: r15864: build fixes for IRIX 6.4 in the build farm; only enable the C++ reserved word check when we selecte --enable-developer (This used to be commit ece5fe3e78da460fb1c0eca3185da7f80c5cfdc4) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b9267a7d83..e6358f5abb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -30,7 +30,11 @@ #include "config.h" #endif -#ifndef __cplusplus +/* only do the C++ reserved word check when we compile + to include --with-developer since too many systems + still have comflicts with their header files (e.g. IRIX 6.4) */ + +#if !defined(__cplusplus) && defined(DEVELOPER) #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -- cgit From 9e7377e81f61b2a3e4b8ff4cc5cd926e25ddacf3 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 15 Jun 2006 21:45:10 +0000 Subject: r16269: Fix the build. Guenther (This used to be commit 546710d58c07acdaa175caa48cec4d3f2bc657ad) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e6358f5abb..59e8e5cd0f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1540,6 +1540,9 @@ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr); NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error); krb5_error_code nt_status_to_krb5(NTSTATUS nt_status); +void smb_krb5_free_error(krb5_context context, krb5_error *krberror); +krb5_error_code handle_krberror_packet(krb5_context context, + krb5_data *packet); #endif /* HAVE_KRB5 */ -- cgit From fbdcf2663b56007a438ac4f0d8d82436b1bfe688 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 11 Jul 2006 18:01:26 +0000 Subject: r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8) --- source3/include/includes.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 59e8e5cd0f..ab2f6a9641 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -101,6 +101,10 @@ #include #endif +#if HAVE_INTTYPES_H +#include +#endif + #ifdef TIME_WITH_SYS_TIME #include #include @@ -873,6 +877,11 @@ struct timespec { #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +#ifndef _BOOL +typedef int BOOL; +#define _BOOL /* So we don't typedef BOOL again in vfs.h */ +#endif + #ifndef HAVE_STRERROR extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] @@ -905,8 +914,8 @@ extern int errno; #include "intl.h" #include "dlinklist.h" #include "tdb/tdb.h" -#include "tdb/spinlock.h" #include "tdb/tdbutil.h" +#include "tdb/tdbback.h" #include "talloc.h" /* And a little extension. Abort on type mismatch */ @@ -961,6 +970,7 @@ extern int errno; #include "rpc_ds.h" #include "rpc_echo.h" #include "rpc_shutdown.h" +#include "rpc_unixinfo.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" #include "nt_printing.h" @@ -981,6 +991,8 @@ extern int errno; #include "rpc_client.h" #include "event.h" +#include "libndr/libndr.h" + /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. @@ -1054,6 +1066,10 @@ enum flush_reason_enum { /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */ NUM_FLUSH_REASONS}; +#ifndef HAVE_COMPARISON_FN_T +typedef int (*comparison_fn_t)(const void *, const void *); +#endif + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" -- cgit From e1da1fcf12164f50f3462c90f0bb785d18c59b0b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 17 Jul 2006 21:09:02 +0000 Subject: r17098: Samba3 now cleanly passes Samba4 RAW-LOCK torture test. Phew - that was painful :-). But what it means is that we now implement lock cancels and I can add lock cancels into POSIX lock handling which will fix the fast/slow system call issue with cifsfs ! Jeremy. (This used to be commit f1a9cf075b87c76c032d19da0168424c90f6cb3c) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ab2f6a9641..86d7f069cd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -936,6 +936,7 @@ extern int errno; #include "debugparse.h" #include "version.h" #include "privileges.h" +#include "locking.h" #include "smb.h" #include "ads_cldap.h" #include "nameserv.h" -- cgit From 986461b6be03eefd3bd9d9c5f5921e14189813b2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 18 Aug 2006 16:25:09 +0000 Subject: r17607: Adapt the Samba4 directory structure for tdb. Makes it easier to diff. Let's see what it breaks. For me it works :-) Volker (This used to be commit 337be14b432e5dfd80c7418b2db4fe0087259b77) --- source3/include/includes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 86d7f069cd..bd65edbab0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -913,9 +913,9 @@ extern int errno; #include "xfile.h" #include "intl.h" #include "dlinklist.h" -#include "tdb/tdb.h" -#include "tdb/tdbutil.h" -#include "tdb/tdbback.h" +#include "tdb.h" +#include "tdbutil.h" +#include "tdbback.h" #include "talloc.h" /* And a little extension. Abort on type mismatch */ -- cgit From 975b15949013f86ffa43675537183b20f3519ed2 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 22 Aug 2006 22:53:08 +0000 Subject: r17723: * BUG 3969: Fix unsigned time comparison with expiration policy from AD DC * Merge patches from SLES10 to make sure we talk to the correct winbindd process when performing pam_auth (and pull the password policy info). (This used to be commit 43bd8c00abb38eb23a1497a255d194fb1bbffffb) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bd65edbab0..524e6ab8d2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -671,6 +671,14 @@ typedef int socklen_t; #endif /* don't lie. If we don't have it, then don't use it */ #endif +#if !defined(int64) +#if (SIZEOF_LONG == 8) +#define int64 long +#elif (SIZEOF_LONG_LONG == 8) +#define int64 long long +#endif /* don't lie. If we don't have it, then don't use it */ +#endif + /* * Types for devices, inodes and offsets. -- cgit From ee0e397d6f003c583768803aa27716b2b7a23981 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 3 Sep 2006 21:07:16 +0000 Subject: r18019: Fix a C++ warnings: Don't use void * in libads/ for LDAPMessage anymore. Compiled it on systems with and without LDAP, I hope it does not break the build farm too badly. If it does, I'll fix it tomorrow. Volker (This used to be commit b2ff9680ebe0979fbeef7f2dabc2e3f27c959d11) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 524e6ab8d2..3629996ff9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1084,6 +1084,10 @@ typedef int (*comparison_fn_t)(const void *, const void *); #include "proto.h" #endif +#ifdef HAVE_ADS +#include "ads_protos.h" +#endif + /* We need this after proto.h to reference GetTimeOfDay(). */ #include "smbprofile.h" -- cgit From b85e21d3f4c172e0dd2f194c2370653aa38101ee Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 3 Sep 2006 21:31:51 +0000 Subject: r18020: Fix SunX (with LDAP but without ADS) (This used to be commit aa61a16c9f87d7ef002beda0b1795964e76f0ce5) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3629996ff9..35dd37748a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1084,7 +1084,7 @@ typedef int (*comparison_fn_t)(const void *, const void *); #include "proto.h" #endif -#ifdef HAVE_ADS +#ifdef HAVE_LDAP #include "ads_protos.h" #endif -- cgit From 82ed0866182afa6b8a2285f46bdd8f326db9032f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 6 Sep 2006 22:08:06 +0000 Subject: r18193: Not quite to autogenerated NDR but closer thanks to Jelmer's initial work. I'm including the librpc/gen_ndr directory in svn temporarily just to get some compile issues straightened out. (This used to be commit cf271aa433cfa606be5dbf3ed1d94fe3caf57653) --- source3/include/includes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 35dd37748a..ab85c0e75e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1000,7 +1000,8 @@ extern int errno; #include "rpc_client.h" #include "event.h" -#include "libndr/libndr.h" +#include "librpc/ndr/libndr.h" +#include "librpc/gen_ndr/unixinfo.h" /* * Type for wide character dirent structure. -- cgit From 2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 8 Sep 2006 14:28:06 +0000 Subject: r18271: Big change: * autogenerate lsa ndr code * rename 'enum SID_NAME_USE' to 'enum lsa_SidType' * merge a log more security descriptor functions from gen_ndr/ndr_security.c in SAMBA_4_0 The most embarassing thing is the "#define strlen_m strlen" We need a real implementation in SAMBA_3_0 which I'll work on after this code is in. (This used to be commit 3da9f80c28b1e75ef6d46d38fbb81ade6b9fa951) --- source3/include/includes.h | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ab85c0e75e..635cf3807f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -66,6 +66,36 @@ #undef HAVE_TERMIOS_H #endif +#ifdef __GNUC__ +/** gcc attribute used on function parameters so that it does not emit + * warnings about them being unused. **/ +# define UNUSED(param) param __attribute__ ((unused)) +#else +# define UNUSED(param) param +/** Feel free to add definitions for other compilers here. */ +#endif + +#ifndef _PUBLIC_ +#ifdef HAVE_VISIBILITY_ATTR +# define _PUBLIC_ __attribute__((visibility("default"))) +#else +# define _PUBLIC_ +#endif +#endif + +#ifndef NORETURN_ATTRIBUTE +#if (__GNUC__ >= 3) +/** Use gcc attribute to check printf fns. a1 is the 1-based index of + * the parameter containing the format, and a2 the index of the first + * argument. Note that some gcc 2.x versions don't handle this + * properly **/ +#define NORETURN_ATTRIBUTE __attribute__ ((noreturn)) +#else +#define NORETURN_ATTRIBUTE +#endif +#endif + + #if (__GNUC__ >= 3 ) && (__GNUC_MINOR__ >= 1 ) /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first @@ -1000,9 +1030,6 @@ extern int errno; #include "rpc_client.h" #include "event.h" -#include "librpc/ndr/libndr.h" -#include "librpc/gen_ndr/unixinfo.h" - /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. -- cgit From 48e2a2bfb75cdc914345b498012e82331546f0c0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 13 Sep 2006 16:28:25 +0000 Subject: r18481: Use pidl-generated server side code for dfs. (This used to be commit 3f337c104d42321595161d0283b39357df252a8e) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 635cf3807f..319a475bcf 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1005,7 +1005,6 @@ extern int errno; #include "rpc_wkssvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" -#include "rpc_dfs.h" #include "rpc_ds.h" #include "rpc_echo.h" #include "rpc_shutdown.h" -- cgit From 71453ab90dbda7f335a3c7119eb8d404e85a0131 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 14 Sep 2006 14:51:16 +0000 Subject: r18526: Use generated server for unixinfo RPC interface. (This used to be commit a5c0606d7667506fdc64776e32d4b3508195a199) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 319a475bcf..f56faa7551 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1008,7 +1008,6 @@ extern int errno; #include "rpc_ds.h" #include "rpc_echo.h" #include "rpc_shutdown.h" -#include "rpc_unixinfo.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" #include "nt_printing.h" -- cgit From e5db7fee0f5cb3bd7434cdefebabc7a8376aa0d4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 15 Sep 2006 22:49:27 +0000 Subject: r18572: Use the autogenerated client and server for the echo interface and implement some of the missing functions. RPC-ECHO now passes against Samba3. (This used to be commit 9e9a05366176454cc1779acc6c2b6070743f5939) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f56faa7551..3cca090bb9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1006,10 +1006,10 @@ extern int errno; #include "rpc_spoolss.h" #include "rpc_eventlog.h" #include "rpc_ds.h" -#include "rpc_echo.h" #include "rpc_shutdown.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" +#include "librpc/gen_ndr/echo.h" #include "nt_printing.h" #include "idmap.h" #include "client.h" -- cgit From 47e6b7733a2d063e5858da1f5af3408f46611b61 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 22:12:56 +0000 Subject: r18640: move to socket_wrapper to lib/socket_wrapper/ and sync it with samba4 metze (This used to be commit 9c0e5b29f1451a90605cce7e1e032e5516b6970d) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3cca090bb9..1effa69f9a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -941,7 +941,7 @@ extern int errno; #ifdef SOCKET_WRAPPER #define SOCKET_WRAPPER_REPLACE -#include "include/socket_wrapper.h" +#include "lib/socket_wrapper/socket_wrapper.h" #endif /* Our own pstrings and fstrings */ -- cgit From 8f153c6128dd15fb132d8ddb1752e793bd6a5985 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 22:49:20 +0000 Subject: r18644: bring in libreplace in lib/replace metze (This used to be commit 596cbe73dd268742acf456fccd8a234376fb0c97) --- source3/include/includes.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1effa69f9a..e94ba3638d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -27,7 +27,7 @@ #endif #ifndef NO_CONFIG_H /* for some tests */ -#include "config.h" +#include "lib/replace/replace.h" #endif /* only do the C++ reserved word check when we compile @@ -125,6 +125,23 @@ #endif #endif /* RELIANTUNIX */ +#include "system/capability.h" +#include "system/dir.h" +#include "system/filesys.h" +#include "system/glob.h" +#include "system/iconv.h" +#include "system/locale.h" +#include "system/network.h" +#include "system/passwd.h" +#include "system/printing.h" +#include "system/readline.h" +#include "system/select.h" +#include "system/shmem.h" +#include "system/syslog.h" +#include "system/terminal.h" +#include "system/time.h" +#include "system/wait.h" + #include #ifdef HAVE_STDINT_H @@ -939,11 +956,6 @@ extern int errno; #define NGROUPS_MAX 32 /* Guess... */ #endif -#ifdef SOCKET_WRAPPER -#define SOCKET_WRAPPER_REPLACE -#include "lib/socket_wrapper/socket_wrapper.h" -#endif - /* Our own pstrings and fstrings */ #include "pstring.h" -- cgit From b0c3ad39256dd78ff5c152afbfe3d8560e194060 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 23:18:38 +0000 Subject: r18648: this is provided by libreplace metze (This used to be commit cbc3f0926375b92b40c4f550296cf90453288f49) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e94ba3638d..892087b701 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1113,10 +1113,6 @@ enum flush_reason_enum { /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */ NUM_FLUSH_REASONS}; -#ifndef HAVE_COMPARISON_FN_T -typedef int (*comparison_fn_t)(const void *, const void *); -#endif - /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" -- cgit From 19cee7d0564265d14723007db6e02ff44351aa50 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 23:26:14 +0000 Subject: r18649: the PRINTF_ATTRIUTE() macro is provided by libreplace metze (This used to be commit dd76f4f5f374ec4822abbf1a09d26287926b92ce) --- source3/include/includes.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 892087b701..601d9b94d6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -95,17 +95,6 @@ #endif #endif - -#if (__GNUC__ >= 3 ) && (__GNUC_MINOR__ >= 1 ) -/** Use gcc attribute to check printf fns. a1 is the 1-based index of - * the parameter containing the format, and a2 the index of the first - * argument. Note that some gcc 2.x versions don't handle this - * properly **/ -#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) -#else -#define PRINTF_ATTRIBUTE(a1, a2) -#endif - #if defined(__GNUC__) && !defined(__cplusplus) /** gcc attribute used on function parameters so that it does not emit * warnings about them being unused. **/ -- cgit From c1837c24ae688d86eb5f0108da9396d29ff50a9e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 23:27:36 +0000 Subject: r18650: this isn't needed twice in include/includes.h metze (This used to be commit ee1127518347690e8baea1b5010ccada0ba29890) --- source3/include/includes.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 601d9b94d6..2561072e86 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -66,15 +66,6 @@ #undef HAVE_TERMIOS_H #endif -#ifdef __GNUC__ -/** gcc attribute used on function parameters so that it does not emit - * warnings about them being unused. **/ -# define UNUSED(param) param __attribute__ ((unused)) -#else -# define UNUSED(param) param -/** Feel free to add definitions for other compilers here. */ -#endif - #ifndef _PUBLIC_ #ifdef HAVE_VISIBILITY_ATTR # define _PUBLIC_ __attribute__((visibility("default"))) -- cgit From af61cbdae9aa5206e0344d88823ff5b50ef80777 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 23:28:46 +0000 Subject: r18651: this comment is wrong, was cut'n'paste... metze (This used to be commit e3b88fb65567f19964a4ef68267a64de14132e52) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2561072e86..19040e4039 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -76,10 +76,6 @@ #ifndef NORETURN_ATTRIBUTE #if (__GNUC__ >= 3) -/** Use gcc attribute to check printf fns. a1 is the 1-based index of - * the parameter containing the format, and a2 the index of the first - * argument. Note that some gcc 2.x versions don't handle this - * properly **/ #define NORETURN_ATTRIBUTE __attribute__ ((noreturn)) #else #define NORETURN_ATTRIBUTE -- cgit From bc82f70e0b66c55ca90c7dec490de478812151c2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 23:47:36 +0000 Subject: r18653: this stuff is in libreplace... metze (This used to be commit 1dd0ed613410e8b8db44396eeb4627a17f23db34) --- source3/include/includes.h | 103 --------------------------------------------- 1 file changed, 103 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 19040e4039..da336382e3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -908,20 +908,6 @@ struct timespec { #define MAX(a,b) ((a)>(b)?(a):(b)) #endif -#ifndef _BOOL -typedef int BOOL; -#define _BOOL /* So we don't typedef BOOL again in vfs.h */ -#endif - -#ifndef HAVE_STRERROR -extern char *sys_errlist[]; -#define strerror(i) sys_errlist[i] -#endif - -#ifndef HAVE_ERRNO_DECL -extern int errno; -#endif - #ifdef HAVE_BROKEN_GETGROUPS #define GID_T int #else @@ -1159,10 +1145,6 @@ enum flush_reason_enum { #define PASSWORD_LENGTH 8 #endif -#ifdef REPLACE_INET_NTOA -#define inet_ntoa rep_inet_ntoa -#endif - #ifndef HAVE_PIPE #define SYNC_DNS 1 #endif @@ -1191,58 +1173,6 @@ enum flush_reason_enum { #define ULTRIX_AUTH 1 #endif -#ifndef HAVE_STRDUP -char *strdup(const char *s); -#endif - -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t size); -#endif - -#ifndef HAVE_MEMMOVE -void *memmove(void *dest,const void *src,int size); -#endif - -#ifndef HAVE_INITGROUPS -int initgroups(char *name,gid_t id); -#endif - -#ifndef HAVE_RENAME -int rename(const char *zfrom, const char *zto); -#endif - -#ifndef HAVE_MKTIME -time_t mktime(struct tm *t); -#endif - -#ifndef HAVE_STRLCPY -size_t strlcpy(char *d, const char *s, size_t bufsize); -#endif - -#ifndef HAVE_STRLCAT -size_t strlcat(char *d, const char *s, size_t bufsize); -#endif - -#ifndef HAVE_FTRUNCATE -int ftruncate(int f,long l); -#endif - -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - -#ifndef HAVE_STRNLEN -size_t strnlen(const char *s, size_t n); -#endif - -#ifndef HAVE_STRTOUL -unsigned long strtoul(const char *nptr, char **endptr, int base); -#endif - -#ifndef HAVE_SETENV -int setenv(const char *name, const char *value, int overwrite); -#endif - #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESUID_DECL)) /* stupid glibc */ int setresuid(uid_t ruid, uid_t euid, uid_t suid); @@ -1250,13 +1180,6 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid); #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESGID_DECL)) int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #endif -#ifndef HAVE_VASPRINTF_DECL -int vasprintf(char **ptr, const char *format, va_list ap); -#endif - -#ifdef REPLACE_GETPASS -#define getpass(prompt) getsmbpass((prompt)) -#endif /* * Some older systems seem not to have MAXHOSTNAMELEN @@ -1430,28 +1353,6 @@ int fdprintf(int , const char *, ...) PRINTF_ATTRIBUTE(2,3); int d_printf(const char *, ...) PRINTF_ATTRIBUTE(1,2); /*PRINTFLIKE2 */ int d_fprintf(FILE *f, const char *, ...) PRINTF_ATTRIBUTE(2,3); -#ifndef HAVE_SNPRINTF_DECL -/*PRINTFLIKE3 */ -int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); -#endif -#ifndef HAVE_ASPRINTF_DECL -/*PRINTFLIKE2 */ -int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); -#endif - -/* Fix prototype problem with non-C99 compliant snprintf implementations, esp - HPUX 11. Don't change the sense of this #if statement. Read the comments - in lib/snprint.c if you think you need to. See also bugzilla bug 174. */ - -#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) -#define snprintf smb_snprintf -#define vsnprintf smb_vsnprintf - -/* PRINTFLIKE3 */ -int smb_snprintf(char *str,size_t count,const char *fmt,...); -int smb_vsnprintf (char *str, size_t count, const char *fmt, va_list args); - -#endif /* PRINTFLIKE2 */ void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); @@ -1481,10 +1382,6 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE( #endif #endif -#ifndef HAVE_TIMEGM -time_t timegm(struct tm *tm); -#endif - /* * Veritas File System. Often in addition to native. * Quotas different. -- cgit From 921caa41e0fc7732ae48415638bf5f13a17a105c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Sep 2006 00:29:41 +0000 Subject: r18659: restore BOOL, sorry:-) libreplace only provides 'bool' not BOOL metze (This used to be commit ce6a0723ff116fc1867705c3d0b520c36cba5a6e) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index da336382e3..61240a04e5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -908,6 +908,11 @@ struct timespec { #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +#ifndef _BOOL +typedef int BOOL; +#define _BOOL /* So we don't typedef BOOL again in vfs.h */ +#endif + #ifdef HAVE_BROKEN_GETGROUPS #define GID_T int #else -- cgit From fb79acba60660c4b452bb0c99f7423abcc376615 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Sep 2006 01:21:03 +0000 Subject: r18664: this stuff is included from libreplace metze (This used to be commit 054728e071f7e1943376f0d7a5655683dc3422b9) --- source3/include/includes.h | 296 --------------------------------------------- 1 file changed, 296 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 61240a04e5..6c152bff0c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -118,278 +118,6 @@ #include "system/time.h" #include "system/wait.h" -#include - -#ifdef HAVE_STDINT_H -#include -#endif - -#if HAVE_INTTYPES_H -#include -#endif - -#ifdef TIME_WITH_SYS_TIME -#include -#include -#else -#ifdef HAVE_SYS_TIME_H -#include -#else -#include -#endif -#endif - -#ifdef HAVE_SYS_RESOURCE_H -#include -#endif - -#ifdef HAVE_UNISTD_H -#include -#endif - -#include -#include - -#ifdef HAVE_SYS_PARAM_H -#include -#endif - -#ifdef HAVE_STDLIB_H -#include -#endif - -#ifdef HAVE_SYS_SOCKET_H -#include -#endif - -#ifdef HAVE_UNIXSOCKET -#include -#endif - -#ifdef HAVE_SYS_SYSCALL_H -#include -#elif HAVE_SYSCALL_H -#include -#endif - -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef HAVE_STRINGS_H -#include -#endif - -#ifdef HAVE_MEMORY_H -#include -#endif - -#ifdef HAVE_MALLOC_H -#include -#endif - -#ifdef HAVE_FCNTL_H -#include -#else -#ifdef HAVE_SYS_FCNTL_H -#include -#endif -#endif - -#include - -#ifdef HAVE_LIMITS_H -#include -#endif - -#ifdef HAVE_SYS_IOCTL_H -#include -#endif - -#ifdef HAVE_SYS_FILIO_H -#include -#endif - -#include - -#ifdef HAVE_SYS_WAIT_H -#include -#endif -#ifdef HAVE_CTYPE_H -#include -#endif -#ifdef HAVE_GRP_H -#include -#endif -#ifdef HAVE_SYS_PRIV_H -#include -#endif -#ifdef HAVE_SYS_ID_H -#include -#endif - -#include - -#ifdef HAVE_UTIME_H -#include -#endif - -#ifdef HAVE_SYS_SELECT_H -#include -#endif - -#ifdef HAVE_SYS_MODE_H -/* apparently AIX needs this for S_ISLNK */ -#ifndef S_ISLNK -#include -#endif -#endif - -#ifdef HAVE_GLOB_H -#include -#endif - -#include - -#ifdef HAVE_STDARG_H -#include -#else -#include -#endif - -#include -#include -#include - -#ifdef HAVE_SYSLOG_H -#include -#else -#ifdef HAVE_SYS_SYSLOG_H -#include -#endif -#endif - -#include - -#ifdef HAVE_NETINET_TCP_H -#include -#endif - -/* - * The next three defines are needed to access the IPTOS_* options - * on some systems. - */ - -#ifdef HAVE_NETINET_IN_SYSTM_H -#include -#endif - -#ifdef HAVE_NETINET_IN_IP_H -#include -#endif - -#ifdef HAVE_NETINET_IP_H -#include -#endif - -#if defined(HAVE_TERMIOS_H) -/* POSIX terminal handling. */ -#include -#elif defined(HAVE_TERMIO_H) -/* Older SYSV terminal handling - don't use if we can avoid it. */ -#include -#elif defined(HAVE_SYS_TERMIO_H) -/* Older SYSV terminal handling - don't use if we can avoid it. */ -#include -#endif - -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif - -#ifdef HAVE_SYS_MMAN_H -#include -#endif - -#ifdef HAVE_NET_IF_H -#include -#endif - - -#ifdef HAVE_SYS_MOUNT_H -#include -#endif - -#ifdef HAVE_SYS_VFS_H -#include -#endif - -#ifdef HAVE_SYS_ACL_H -#include -#endif - -#ifdef HAVE_SYS_FS_S5PARAM_H -#include -#endif - -#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY) -#include -#endif - -#ifdef HAVE_SYS_STATFS_H -# include -#endif - -#ifdef HAVE_DUSTAT_H -#include -#endif - -#ifdef HAVE_SYS_STATVFS_H -#include -#endif - -#ifdef HAVE_SHADOW_H -/* - * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in which - * was included above. However includes 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 -#endif - -#ifdef HAVE_GETPWANAM -#include -#include -#include -#endif - -#ifdef HAVE_SYS_SECURITY_H -#include -#include -#define PASSWORD_LENGTH 16 -#endif /* HAVE_SYS_SECURITY_H */ - #ifdef HAVE_STROPTS_H #include #endif @@ -447,26 +175,6 @@ #endif #endif /* HAVE_NETGROUP */ -#if defined(HAVE_SYS_IPC_H) -#include -#endif /* HAVE_SYS_IPC_H */ - -#if defined(HAVE_SYS_SHM_H) -#include -#endif /* HAVE_SYS_SHM_H */ - -#ifdef HAVE_NATIVE_ICONV -#ifdef HAVE_ICONV -#include -#endif -#ifdef HAVE_GICONV -#include -#endif -#ifdef HAVE_BICONV -#include -#endif -#endif - #if HAVE_KRB5_H #include #else @@ -537,10 +245,6 @@ #include #endif -#if HAVE_LOCALE_H -#include -#endif - #if HAVE_LANGINFO_H #include #endif -- cgit From a3e1f7e44d2d6a5ef801badc189b3dcf19dc72d9 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 20 Sep 2006 00:15:50 +0000 Subject: r18703: Fix the annoying effect that happens when nscd is running: We usually do not get the results from user/group script modifications immediately. A lot of users do add nscd restart/refresh commands into their scripts to workaround that while we could flush the nscd caches directly using libnscd. Guenther (This used to be commit 7db6ce295afbedfada7b207ad56566d2195a0d21) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6c152bff0c..bcf0fa4277 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1237,4 +1237,8 @@ void exit_server(const char *const reason) NORETURN_ATTRIBUTE ; void exit_server_cleanly(const char *const reason) NORETURN_ATTRIBUTE ; void exit_server_fault(void) NORETURN_ATTRIBUTE ; +#ifdef HAVE_LIBNSCD +#include "libnscd.h" +#endif + #endif /* _INCLUDES_H */ -- cgit From beecb90440af7cb59e31ffc708fdb7ad53932b6b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 21 Sep 2006 08:48:18 +0000 Subject: r18784: hopefully fix the BOOL bug on AIX metze (This used to be commit 454d9590de6ff94a1edd7321e26af0f0978a356a) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bcf0fa4277..1dbf92f036 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -612,9 +612,9 @@ struct timespec { #define MAX(a,b) ((a)>(b)?(a):(b)) #endif -#ifndef _BOOL +#ifndef _UPPER_BOOL typedef int BOOL; -#define _BOOL /* So we don't typedef BOOL again in vfs.h */ +#define _UPPER_BOOL #endif #ifdef HAVE_BROKEN_GETGROUPS -- cgit From 7ba2554d88a187ca1f4f40014363fdf9de2223a0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 21 Sep 2006 23:57:32 +0000 Subject: r18802: Use the pidl-generated code for the srvsvc interface, both client and server code. This has had some basic testing. I'll do more during the next couple of days and hopefully also make RPC-SRVSVC from Samba4 pass against it. (This used to be commit ef10672399c4b82700dc431b4d93431ffdd42d98) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1dbf92f036..16056a56a1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -684,7 +684,6 @@ typedef int BOOL; #include "reg_objects.h" #include "rpc_reg.h" #include "rpc_samr.h" -#include "rpc_srvsvc.h" #include "rpc_wkssvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" @@ -692,6 +691,7 @@ typedef int BOOL; #include "rpc_shutdown.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" +#include "librpc/gen_ndr/srvsvc.h" #include "librpc/gen_ndr/echo.h" #include "nt_printing.h" #include "idmap.h" -- cgit From 21931b1ca834f41c5ca931cdfb6f0347b5cb3c96 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 22 Sep 2006 04:16:58 +0000 Subject: r18810: use a copy of samba4's talloc under lib/talloc/ to make mergeing easier. metze (This used to be commit d49ffbc19b29f7620e427de133ffab74721f37e8) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 16056a56a1..ede93e5865 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -638,7 +638,7 @@ typedef int BOOL; #include "tdbutil.h" #include "tdbback.h" -#include "talloc.h" +#include "lib/talloc/talloc.h" /* And a little extension. Abort on type mismatch */ #define talloc_get_type_abort(ptr, type) \ (type *)talloc_check_name_abort(ptr, #type) -- cgit From ed5f7cce2a6b094933c5e006d465570870f269ca Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 22 Sep 2006 09:09:01 +0000 Subject: r18818: Forgot header file. Guenther (This used to be commit 9da91022f9fa0e6610a235ddd2130c8b01d6f1c5) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ede93e5865..fd6ff2f5b2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -645,6 +645,7 @@ typedef int BOOL; #include "nt_status.h" #include "ads.h" +#include "gpo.h" #include "ads_dns.h" #include "interfaces.h" #include "trans2.h" -- cgit From 93dc24eed93eb8960d012c0a6e377cf3d8ebfd35 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 27 Sep 2006 11:39:43 +0000 Subject: r18950: I can't see where stropts.h and poll.h are needed (I just removed the only reference to poll() in my last commit) they were added in this commit, without make usage of them. http://cvs.samba.org/cgi-bin/cvsweb/samba/source/configure.in.diff?r1=1.21&r2=1.22&f=h http://cvs.samba.org/cgi-bin/cvsweb/samba/source/include/includes.h.diff?r1=1.105&r2=1.106&f=h metze (This used to be commit b852cf46c213b2e059a66cbe0d058ed063c37957) --- source3/include/includes.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fd6ff2f5b2..7a474c450f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -118,14 +118,6 @@ #include "system/time.h" #include "system/wait.h" -#ifdef HAVE_STROPTS_H -#include -#endif - -#ifdef HAVE_POLL_H -#include -#endif - #if defined(HAVE_RPC_RPC_H) /* * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h. -- cgit From 2326b147d03102cb7077aa7c8246b6515060284a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 27 Sep 2006 19:03:54 +0000 Subject: r18963: * Move parts of registry headers that were still in use to reg_objects.h * Remove unused rpc headers (This used to be commit 4f79d8c83db5af80078114e9fb39171380d040b1) --- source3/include/includes.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7a474c450f..bef294e575 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -675,13 +675,10 @@ typedef int BOOL; #include "rpc_lsa.h" #include "rpc_netlogon.h" #include "reg_objects.h" -#include "rpc_reg.h" #include "rpc_samr.h" -#include "rpc_wkssvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" #include "rpc_ds.h" -#include "rpc_shutdown.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/srvsvc.h" -- cgit From 7f9aca9772c4b0d5643c83cab0a080c523ec7278 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 2 Oct 2006 06:32:58 +0000 Subject: r19026: we don't need this twice metze (This used to be commit 5d16aa61c6c5e284f6ff742dbf686493e4539c79) --- source3/include/includes.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bef294e575..811d0372e0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -74,14 +74,6 @@ #endif #endif -#ifndef NORETURN_ATTRIBUTE -#if (__GNUC__ >= 3) -#define NORETURN_ATTRIBUTE __attribute__ ((noreturn)) -#else -#define NORETURN_ATTRIBUTE -#endif -#endif - #if defined(__GNUC__) && !defined(__cplusplus) /** gcc attribute used on function parameters so that it does not emit * warnings about them being unused. **/ -- cgit From 9830fc431babfe251ab079087b58ea55120a515d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Oct 2006 11:38:40 +0000 Subject: r19240: move the NO_CONFIG_H check to libreplace this fixes the quota detection configure and maybe more configure tests metze (This used to be commit a3a082c42ccb21cb16d2e53991808ef3224efc6c) --- source3/include/includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 811d0372e0..0f7b2d86d0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -26,9 +26,7 @@ #undef SIZEOF_LONG #endif -#ifndef NO_CONFIG_H /* for some tests */ #include "lib/replace/replace.h" -#endif /* only do the C++ reserved word check when we compile to include --with-developer since too many systems -- cgit From 876be25055e0cc6f2c18ddfc377151b2ca68a54f Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 13 Oct 2006 23:43:27 +0000 Subject: r19270: Stop depending on internal MIT symbols. These are private on MacOS x, so we can't get at them even if we wanted to. Kerberos experts, please take a look to make sure I've done the right thing! (This used to be commit 9b8e179fcc1fb877e8601bfd242ee1fd615b554c) --- source3/include/includes.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0f7b2d86d0..b695253f12 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1105,6 +1105,14 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con void krb5_free_unparsed_name(krb5_context ctx, char *val); #endif +/* Stub out initialize_krb5_error_table since it is not present in all + * Kerberos implementations. If it's not present, it's not necessary to + * call it. + */ +#ifndef HAVE_INITIALIZE_KRB5_ERROR_TABLE +#define initialize_krb5_error_table() +#endif + /* Samba wrapper function for krb5 functionality. */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); @@ -1113,7 +1121,6 @@ BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_tick krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); -void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype); -- cgit From aa3ca346d82da2501406cc1f482643b20905e467 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 20 Oct 2006 23:46:59 +0000 Subject: r19429: moved tdb/common/tdbutil.c into lib/util_tdb.c see discussion on samba-technical (This used to be commit 1ad563286f00be0d72930b81b10cb74f13c5fbff) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b695253f12..2e87b25edd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -617,7 +617,7 @@ typedef int BOOL; #include "intl.h" #include "dlinklist.h" #include "tdb.h" -#include "tdbutil.h" +#include "util_tdb.h" #include "tdbback.h" #include "lib/talloc/talloc.h" -- cgit From 8fa0a80b498f2681fc9a4f5e6ab5522ee599f224 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 16 Nov 2006 23:48:46 +0000 Subject: r19754: * When using a krb5 session setup, we don't fill in the server_name string the clis_state struct. So call saf_store() after we have the short domain name in the lsa_query_inof_policy code. * Remove unused server string in saf_delete() (This used to be commit 3eddae2f2080f8dafec883cb9ffa2e578c242607) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2e87b25edd..f21033b61f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -178,6 +178,9 @@ #ifndef LDAP_OPT_SUCCESS #define LDAP_OPT_SUCCESS 0 #endif +#ifndef LDAP_SCOPE_ONELEVEL +#define LDAP_SCOPE_ONELEVEL 1 +#endif /* Solaris 8 and maybe other LDAP implementations spell this "..._INPROGRESS": */ #if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS) #define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS -- cgit From 9a88644bb5834b526085fad7536a02e333bf8c3c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 17 Nov 2006 01:25:23 +0000 Subject: r19758: remove the LDAP_SCOPE_ONELEVEL define (not needed after svnup) (This used to be commit e37132f219bb9ef52c7fc9b396bd272dd5abca70) --- source3/include/includes.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f21033b61f..2e87b25edd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -178,9 +178,6 @@ #ifndef LDAP_OPT_SUCCESS #define LDAP_OPT_SUCCESS 0 #endif -#ifndef LDAP_SCOPE_ONELEVEL -#define LDAP_SCOPE_ONELEVEL 1 -#endif /* Solaris 8 and maybe other LDAP implementations spell this "..._INPROGRESS": */ #if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS) #define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS -- cgit From 932e95abde4a1a860de7589612d38d6517e8ef27 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 21 Nov 2006 00:00:18 +0000 Subject: r19808: remove old smbwrapper references (This used to be commit c142b629c8f08597519a754a8fb78b7708279f75) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2e87b25edd..078e5c6e09 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -677,10 +677,6 @@ typedef int BOOL; #include "idmap.h" #include "client.h" -#ifdef WITH_SMBWRAPPER -#include "smbw.h" -#endif - #include "session.h" #include "asn_1.h" #include "popt.h" -- cgit From e1d4e31c440c08f8138ab16b3e0095aa371ca09e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 28 Dec 2006 18:09:32 +0000 Subject: r20386: remove unneeded dlopen related configure checks and includes this is done by libreplace... this hopefully fixes the build on HPUX 11.00 metze (This used to be commit eed50e104794d855b204cfea52626f47b6fa3f52) --- source3/include/includes.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 078e5c6e09..538bdd75ec 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -894,12 +894,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define DEFAULT_SOCKET_OPTIONS "" #endif -/* Load header file for dynamic linking stuff */ - -#ifdef HAVE_DLFCN_H -#include -#endif - /* dmalloc -- free heap debugger (dmalloc.org). This should be near * the *bottom* of include files so as not to conflict. */ #ifdef ENABLE_DMALLOC -- cgit From a328e2f9970a221227df79e361752ae776120f46 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 3 Jan 2007 08:55:22 +0000 Subject: r20501: Check in config.h fix from Michael Adam (This used to be commit d10dd47fb8908a4372aa6932e40b23189784522c) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 538bdd75ec..b341d1ee95 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -28,6 +28,14 @@ #include "lib/replace/replace.h" +/* make sure we have included the correct config.h */ +#ifndef NO_CONFIG_H /* for some tests */ +#ifndef CONFIG_H_IS_FROM_SAMBA +#error "make sure you have removed all config.h files from standalone builds!" +#error "the included config.h isn't from samba!" +#endif +#endif /* NO_CONFIG_H */ + /* only do the C++ reserved word check when we compile to include --with-developer since too many systems still have comflicts with their header files (e.g. IRIX 6.4) */ -- cgit From b9b26be1744b792a54f0a77af140237b4dc5a870 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 24 Jan 2007 01:48:08 +0000 Subject: r20986: Commit the prototype of the nss_info plugin interface. This allows a provider to supply the homedirectory, etc... attributes for a user without requiring support in core winbindd code. The idmap_ad.c module has been modified to provide the idmap 'ad' library as well as the rfc2307 and sfu "winbind nss info" support. The SID/id mapping is working in idmap_ad but the nss_info still has a few quirks that I'm in the process of resolving. (This used to be commit aaec0115e2c96935499052d9a637a20c6445986e) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b341d1ee95..84bd90cc27 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -768,6 +768,8 @@ enum flush_reason_enum { /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */ NUM_FLUSH_REASONS}; +#include "nss_info.h" + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" -- cgit From a4faa575a4eef0b29a9129779efe5a930f464e15 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 24 Jan 2007 04:44:27 +0000 Subject: r20992: another attempt at fixing the build breakage (This used to be commit 7011a1b5abc7d56da5beba904e3328014f315f0d) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 84bd90cc27..148bfc4414 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -777,6 +777,8 @@ enum flush_reason_enum { #ifdef HAVE_LDAP #include "ads_protos.h" +#else +typedef LDAPMessage void; #endif /* We need this after proto.h to reference GetTimeOfDay(). */ -- cgit From b0d4004396bd1f9a2b9faa4f6ba62d36d63c50ca Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 24 Jan 2007 08:55:00 +0000 Subject: r20996: Build fix from Kai Blin (This used to be commit 91fdbd4cf5f8fe44adcbe8dc8ef38579a8306c39) --- source3/include/includes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 148bfc4414..da390c87ea 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -778,7 +778,8 @@ enum flush_reason_enum { #ifdef HAVE_LDAP #include "ads_protos.h" #else -typedef LDAPMessage void; +struct _LDAPMessage; +typedef struct _LDAPMessage *LDAPMessage; #endif /* We need this after proto.h to reference GetTimeOfDay(). */ -- cgit From a31f10c99edd7cb80d62d377c8efead5a4846b40 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 24 Jan 2007 14:39:46 +0000 Subject: r21001: * Use a simple '#define LDAPMessage void' to fix the build problems in the nss_info interface when HAVE_LDAP is undefined. * Revert previous ifdef HAVE_ADS brakets * Remove an unused init function wrapper. (This used to be commit 2ba353848b6d8d36520e7fd82576653a39c602cd) --- source3/include/includes.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index da390c87ea..84bd90cc27 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -777,9 +777,6 @@ enum flush_reason_enum { #ifdef HAVE_LDAP #include "ads_protos.h" -#else -struct _LDAPMessage; -typedef struct _LDAPMessage *LDAPMessage; #endif /* We need this after proto.h to reference GetTimeOfDay(). */ -- cgit From 8bfa9351614115ceb8bfaa6f76355ddc14ec248b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 31 Jan 2007 11:48:14 +0000 Subject: r21074: Preparation for the import of samba4 notify: Add the file notify.idl and the resulting marshalling/unmarshalling routines in gen_ndr/ Volker (This used to be commit a2ea54c23456925a8ed317edb1adf82d074041fc) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 84bd90cc27..f7edb68c16 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -681,6 +681,7 @@ typedef int BOOL; #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/srvsvc.h" #include "librpc/gen_ndr/echo.h" +#include "librpc/gen_ndr/notify.h" #include "nt_printing.h" #include "idmap.h" #include "client.h" -- cgit From 1898eaddb805e86d0c36bd289e7fa61d7bbd4810 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 1 Feb 2007 15:10:13 +0000 Subject: r21110: Fix kinit with Heimdal (Bug #4226). Guenther (This used to be commit ea38e1f8362d75e7ac058a7c4aa06f1ca92ec108) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f7edb68c16..8aaaba9799 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1176,6 +1176,8 @@ krb5_error_code nt_status_to_krb5(NTSTATUS nt_status); void smb_krb5_free_error(krb5_context context, krb5_error *krberror); krb5_error_code handle_krberror_packet(krb5_context context, krb5_data *packet); +void krb5_get_init_creds_opt_free(krb5_get_init_creds_opt *opt); +krb5_error_code krb5_get_init_creds_opt_alloc(krb5_context context, krb5_get_init_creds_opt **opt); #endif /* HAVE_KRB5 */ -- cgit From 69cee2a3ec4f39aab83a8cbf55307df182bf3065 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 8 Feb 2007 17:02:39 +0000 Subject: r21240: Fix longstanding Bug #4009. For the winbind cached ADS LDAP connection handling (ads_cached_connection()) we were (incorrectly) assuming that the service ticket lifetime equaled the tgt lifetime. For setups where the service ticket just lives 10 minutes, we were leaving hundreds of LDAP connections in CLOSE_WAIT state, until we fail to service entirely with "Too many open files". Also sequence_number() in winbindd_ads.c needs to delete the cached LDAP connection after the ads_do_search_retry() has failed to submit the search request (although the bind succeeded (returning an expired service ticket that we cannot delete from the memory cred cache - this will get fixed later)). Guenther (This used to be commit 7e1a84b7226fb8dcd5d34c64a3478a6d886a9a91) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8aaaba9799..3864faddb9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1165,7 +1165,7 @@ BOOL smb_krb5_principal_compare_any_realm(krb5_context context, krb5_const_principal princ1, krb5_const_principal princ2); int cli_krb5_get_ticket(const char *principal, time_t time_offset, - DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname); + DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname, time_t *tgs_expire); PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *new_start_time); krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code); -- cgit From 3adeb4274250ec4420d9d874b07d8e688a354402 Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 9 Mar 2007 18:51:48 +0000 Subject: r21778: Wrap calls to krb5_get_init_creds_opt_free to handle the different calling convention in the latest MIT changes. Apparantly Heimdal is also changing to this calling convention. (This used to be commit c29c69d2df377fabb88a78e6f5237de106d5c2c5) --- source3/include/includes.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3864faddb9..c71acd3866 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1176,8 +1176,11 @@ krb5_error_code nt_status_to_krb5(NTSTATUS nt_status); void smb_krb5_free_error(krb5_context context, krb5_error *krberror); krb5_error_code handle_krberror_packet(krb5_context context, krb5_data *packet); -void krb5_get_init_creds_opt_free(krb5_get_init_creds_opt *opt); -krb5_error_code krb5_get_init_creds_opt_alloc(krb5_context context, krb5_get_init_creds_opt **opt); + +void smb_krb5_get_init_creds_opt_free(krb5_context context, + krb5_get_init_creds_opt *opt); +krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context, + krb5_get_init_creds_opt **opt); #endif /* HAVE_KRB5 */ -- cgit From edccfc91928c323f18febb7b90e41e0ddbfd8c7c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 15 Mar 2007 19:18:18 +0000 Subject: r21845: Refactor the sessionsetupX code a little to allow us to return a NT_STATUS_TIME_DIFFERENCE_AT_DC error to a client when there's clock skew. Will help people debug this. Prepare us for being able to return the correct sessionsetupX "NT_STATUS_MORE_PROCESSING_REQUIRED" error with associated krb5 clock skew error to allow clients to re-sync time with us when we're eventually able to be a KDC. Jeremy. (This used to be commit c426340fc79a6b446033433b8de599130adffe28) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c71acd3866..5b81cfbfab 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1181,6 +1181,11 @@ void smb_krb5_get_init_creds_opt_free(krb5_context context, krb5_get_init_creds_opt *opt); krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context, krb5_get_init_creds_opt **opt); +krb5_error_code smb_krb5_mk_error(krb5_context context, + krb5_error_code error_code, + const krb5_principal server, + krb5_data *reply); + #endif /* HAVE_KRB5 */ -- cgit From efbdda540a5e0e4d8dff15b0a5891e38244c2c61 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 20 Mar 2007 02:20:16 +0000 Subject: r21883: Try and fix the build by removing the prototypes for functions that take a gss context handle in includes.h Jeremy. (This used to be commit 638b03242d4a6b1df2477dad19240ed61a14a5a3) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b81cfbfab..b591d7d807 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1186,6 +1186,14 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, const krb5_principal server, krb5_data *reply); +/* Call for SMB transport encryption. */ +#if defined(HAVE_GSSAPI_SUPPORT) +NTSTATUS common_gss_decrypt_buffer(gss_ctx_id_t context_handle, char *buf); +#endif +#if defined(HAVE_GSSAPI_SUPPORT) +NTSTATUS common_gss_encrypt_buffer(gss_ctx_id_t context_handle, char *buf, char **buf_out); +#endif + #endif /* HAVE_KRB5 */ -- cgit From 42238c78bb8820a21cfb08fc29a5109ee1a62bab Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 21 Mar 2007 19:15:14 +0000 Subject: r21917: Start to do the gss versions of sign+seal. Jeremy. (This used to be commit a226645353a40047b72de1b96c3a7676a2bf1034) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b591d7d807..c51da335a2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1187,10 +1187,10 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, krb5_data *reply); /* Call for SMB transport encryption. */ -#if defined(HAVE_GSSAPI_SUPPORT) +#if defined(HAVE_GSSAPI) NTSTATUS common_gss_decrypt_buffer(gss_ctx_id_t context_handle, char *buf); #endif -#if defined(HAVE_GSSAPI_SUPPORT) +#if defined(HAVE_GSSAPI) NTSTATUS common_gss_encrypt_buffer(gss_ctx_id_t context_handle, char *buf, char **buf_out); #endif -- cgit From 8b63654c2e63448cc21505d7996e1a4805e391df Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 27 Mar 2007 00:50:53 +0000 Subject: r21969: Start working on the gss-side of the server negotiation. Jeremy. (This used to be commit fbc569b530104679e47fe743963eb0c4384de6ae) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c51da335a2..b4485ba30d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1188,10 +1188,10 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, /* Call for SMB transport encryption. */ #if defined(HAVE_GSSAPI) -NTSTATUS common_gss_decrypt_buffer(gss_ctx_id_t context_handle, char *buf); +NTSTATUS common_gss_decrypt_buffer(struct smb_tran_enc_state_gss *gss_state, char *buf); #endif #if defined(HAVE_GSSAPI) -NTSTATUS common_gss_encrypt_buffer(gss_ctx_id_t context_handle, char *buf, char **buf_out); +NTSTATUS common_gss_encrypt_buffer(struct smb_tran_enc_state_gss *gss_state, char *buf, char **buf_out); #endif #endif /* HAVE_KRB5 */ -- cgit From 4a66d0e232271968ba96da50274428916a393975 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 27 Mar 2007 21:13:31 +0000 Subject: r21991: I hate Steve French :-). Add support for encryption contexts.... Jeremy. (This used to be commit ae8f3649f773b8a8dcb55921536d038d3475322e) --- source3/include/includes.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b4485ba30d..5b81cfbfab 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1186,14 +1186,6 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, const krb5_principal server, krb5_data *reply); -/* Call for SMB transport encryption. */ -#if defined(HAVE_GSSAPI) -NTSTATUS common_gss_decrypt_buffer(struct smb_tran_enc_state_gss *gss_state, char *buf); -#endif -#if defined(HAVE_GSSAPI) -NTSTATUS common_gss_encrypt_buffer(struct smb_tran_enc_state_gss *gss_state, char *buf, char **buf_out); -#endif - #endif /* HAVE_KRB5 */ -- cgit From 71b8fdff85559213f5b880946cc918777c2389cc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 28 Mar 2007 19:47:59 +0000 Subject: r22003: Fix from Jiri.Sasek@Sun.COM to wrap our krb5_locate_kdc call as smb_krb5_locate_kdc to prevent incorrect linking and crashes on Solaris. Jeremy. (This used to be commit 7d30737c8d851505e81a60443baf9a8c7e523472) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b81cfbfab..8bdf9c992f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1120,7 +1120,10 @@ int create_kerberos_key_from_string(krb5_context context, krb5_principal host_pr int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); +krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); +#if defined(HAVE_KRB5_LOCATE_KDC) krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); +#endif krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); -- cgit From d2a57b63932496ba61ab2b9773eb959b6abaab8a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 2 Apr 2007 23:07:06 +0000 Subject: r22049: HPUX build fixes from . Jeremy. (This used to be commit b70af25e851b2695e552b10f1befb16e336fb36f) --- source3/include/includes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8bdf9c992f..47be8bea90 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -173,6 +173,15 @@ #if HAVE_LBER_H #include +#ifdef HPUX +/* Define ber_tag_t and ber_int_t for using + * HP LDAP-UX Integration products' LDAP libraries. +*/ +#ifndef ber_tag_t +typedef unsigned int ber_tag_t; +typedef unsigned int ber_int_t; +#endif +#endif /* HPUX */ #ifndef LBER_USE_DER #define LBER_USE_DER 0x01 #endif -- cgit From d4f15433352b9decda2f2a59906aa0f74dac0fb7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 6 Apr 2007 19:38:35 +0000 Subject: r22108: Fix from to try and fix the HPUX builds. Jeremy. (This used to be commit 4de297112b9d87e58d870889007001169265e084) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 47be8bea90..53f6ab8b58 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -178,8 +178,8 @@ * HP LDAP-UX Integration products' LDAP libraries. */ #ifndef ber_tag_t -typedef unsigned int ber_tag_t; -typedef unsigned int ber_int_t; +typedef unsigned long ber_tag_t; +typedef int ber_int_t; #endif #endif /* HPUX */ #ifndef LBER_USE_DER -- cgit From 97079ab953a9021d67b3ec775d0321d1d4bd0e73 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 17 Apr 2007 16:53:06 +0000 Subject: r22315: move tdbback.c content into tdbbackup.c and make the functions static. also use libreplace headers in tdbbackup.c metze (This used to be commit 1ca12b1c9e7e8267fa13a40ebeb2bdcd199237de) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 53f6ab8b58..90d2723251 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -635,7 +635,6 @@ typedef int BOOL; #include "dlinklist.h" #include "tdb.h" #include "util_tdb.h" -#include "tdbback.h" #include "lib/talloc/talloc.h" /* And a little extension. Abort on type mismatch */ -- cgit From 655d2b5200e96fc9a4b3b74b6a931cece03fe503 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sun, 22 Apr 2007 21:21:26 +0000 Subject: r22468: Fixing implicit declaration of krb5_set_default_tgs_ktypes (which is hidden by KRB5_PRIVATE in MIT and doesn't exist on Heimdal). Guenther (This used to be commit 664db1cff674073c8eeaf69256a73d11e7ed9e3c) --- source3/include/includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 90d2723251..b6b0d470d7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1102,9 +1102,7 @@ krb5_error_code smb_krb5_unparse_name(krb5_context context, krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds); #endif -#ifndef HAVE_KRB5_SET_DEFAULT_TGS_KTYPES krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); -#endif #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock); -- cgit From 1ee9650a1dfa28badac1f37b4c14fca920c6330c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 23 Apr 2007 08:40:54 +0000 Subject: r22479: Add "net ads keytab list". Guenther (This used to be commit 9ec76c542775ae58ff03f42ebfa1acc1a63a1bb1) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b6b0d470d7..9a368f8084 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1194,6 +1194,10 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, krb5_error_code error_code, const krb5_principal server, krb5_data *reply); +krb5_enctype smb_get_enctype_from_kt_entry(const krb5_keytab_entry *kt_entry); +krb5_error_code smb_krb5_enctype_to_string(krb5_context context, + krb5_enctype enctype, + char **etype_s); #endif /* HAVE_KRB5 */ -- cgit From 4c185a6077322ba64231d23dda25a6b6d44d0b12 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 10 May 2007 10:42:13 +0000 Subject: r22775: For the cluster code I've developed a wrapper around tdb to put different database backends in place dynamically. The main abstractions are db_context and db_record, it should be mainly self-describing, see include/dbwrap.h. You open the db just as you would open a tdb, this time with db_open(). If you want to fetch a record, just do the db->fetch() call, if you want to do operations on it, you need to get it with fetch_locked(). I added dbwrap_file.c (not heavily tested lately) as an example for what can be done with that abstraction, uses a file per key. So if anybody is willing to shape that up, we might have a chance on reiserfs again.... :-) This abstraction works fine for brlock.tdb, locking.tdb, connections.tdb and sessionid.tdb. It should work fine for the others as well, I just did not yet get around to convert them. If nobody loudly screams NO, then I will import the code that uses this soon. Volker (This used to be commit e9d7484ca246cfca4a1fd23be35edc2783136ebe) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9a368f8084..5acd7abc36 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -703,6 +703,7 @@ typedef int BOOL; #include "spnego.h" #include "rpc_client.h" #include "event.h" +#include "dbwrap.h" /* * Type for wide character dirent structure. -- cgit From 95bc08e9545850ba57cdcf79bf9f62872b2946c0 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 11 May 2007 12:41:11 +0000 Subject: r22796: Add security descriptor to GROUP_POLICY_OBJECT structure (in preparation of adding GPO security filtering for libgpo). Guenther (This used to be commit b376a39fbf42a6a541fd311418c4a980b9fd4b9e) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5acd7abc36..1fa3aae8f7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -643,7 +643,6 @@ typedef int BOOL; #include "nt_status.h" #include "ads.h" -#include "gpo.h" #include "ads_dns.h" #include "interfaces.h" #include "trans2.h" @@ -668,6 +667,7 @@ typedef int BOOL; #include "mapping.h" #include "passdb.h" #include "rpc_secdes.h" +#include "gpo.h" #include "authdata.h" #include "msdfs.h" #include "rap.h" -- cgit From ac3f08ddbe0b484375624db0e35999a8584b57f4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 21 May 2007 22:17:13 +0000 Subject: r23055: Rewrite messages.c to use auto-generated marshalling in the tdb. I'm doing this because for the clustering the marshalling is needed in more than one place, so I wanted a decent routine to marshall a message_rec struct which was not there before. Tridge, this seems about the same speed as it used to be before, the librpc/ndr overhead in my tests was under the noise. Volker (This used to be commit eaefd00563173dfabb7716c5695ac0a2f7139bb6) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1fa3aae8f7..bbce3bdb5c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -648,13 +648,13 @@ typedef int BOOL; #include "trans2.h" #include "nterr.h" #include "ntioctl.h" -#include "messages.h" #include "charset.h" #include "dynconfig.h" #include "util_getent.h" #include "debugparse.h" #include "version.h" #include "privileges.h" +#include "messages.h" #include "locking.h" #include "smb.h" #include "ads_cldap.h" -- cgit From 3272b1dd602196b2105afda1f9979a8f9596d71e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 30 May 2007 21:55:49 +0000 Subject: r23251: whoops! Fix compile error (This used to be commit 22a3ea40ac69fa3722abf28db845ab284a65ad97) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index bbce3bdb5c..6c1931844e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -780,6 +780,9 @@ enum flush_reason_enum { #include "nss_info.h" +/* generated rpc server implementation functions */ +#include "librpc/gen_ndr/srv_echo.h" + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" -- cgit From d99f4f004ca46e4c0f2e60a231a14708a128f0f2 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 31 May 2007 17:24:30 +0000 Subject: r23271: merge service control pidl change for CloseServiceHandle() from SAMBA_3_0_26 (This used to be commit 0b1bc3521fac52f3164b6cc9e053abc3ceabf5e7) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 6c1931844e..e3e24eff07 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -687,8 +687,6 @@ typedef int BOOL; #include "rpc_ds.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" -#include "librpc/gen_ndr/srvsvc.h" -#include "librpc/gen_ndr/echo.h" #include "librpc/gen_ndr/notify.h" #include "nt_printing.h" #include "idmap.h" @@ -782,6 +780,8 @@ enum flush_reason_enum { /* generated rpc server implementation functions */ #include "librpc/gen_ndr/srv_echo.h" +#include "librpc/gen_ndr/srv_svcctl.h" +#include "librpc/gen_ndr/srv_lsa.h" /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H -- cgit From 97a164ba96d48a81d5e24dda6b866a4d78ea1a78 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 31 May 2007 17:59:04 +0000 Subject: r23274: merge CloseEventlog() pidl conversion from 3.0.26 && fix a few init call renames for svcctl in the previous commit (This used to be commit ebcae48ec10fefa74efcc3563cff50e3b9c2388c) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e3e24eff07..d1cd27585e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -782,6 +782,7 @@ enum flush_reason_enum { #include "librpc/gen_ndr/srv_echo.h" #include "librpc/gen_ndr/srv_svcctl.h" #include "librpc/gen_ndr/srv_lsa.h" +#include "librpc/gen_ndr/srv_eventlog.h" /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H -- cgit From b25bebb960eee796d5c5b1483f20250ed286894b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 2 Jun 2007 08:30:42 +0000 Subject: r23307: move readahead stuff out of libreplace and make it samba3 specific as we can't replace this function in libreplace and we do the some stuff for other function in the same way. metze (This used to be commit 5e9b84326b4c65799e6fa6550de870d9a7ebba85) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d1cd27585e..0e90004bdb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,6 +1214,9 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); #endif /* HAVE_LDAP */ +#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL) +ssize_t readahead(int fd, off64_t offset, size_t count); +#endif /* TRUE and FALSE are part of the C99 standard and gcc, but unfortunately many vendor compilers don't support them. Use True -- cgit From a02badcd4effd3b8d34a77868b24987ac6a7415d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 4 Jun 2007 08:01:48 +0000 Subject: r23328: don't typedef ber_tag_t when it's already done by openldap headers on HP-UX (lber_types.h defines _LBER_TYPES_H). metze (This used to be commit bd1b28dd3e47c2f244baba4a239b0d6dca57f2d2) --- source3/include/includes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0e90004bdb..9c7b3d1c1f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -173,7 +173,7 @@ #if HAVE_LBER_H #include -#ifdef HPUX +#if defined(HPUX) && !defined(_LBER_TYPES_H) /* Define ber_tag_t and ber_int_t for using * HP LDAP-UX Integration products' LDAP libraries. */ @@ -181,7 +181,7 @@ typedef unsigned long ber_tag_t; typedef int ber_int_t; #endif -#endif /* HPUX */ +#endif /* defined(HPUX) && !defined(_LBER_TYPES_H) */ #ifndef LBER_USE_DER #define LBER_USE_DER 0x01 #endif -- cgit From de565785f5e1f097bd75f57331425c4185185f80 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 10 Jun 2007 17:02:09 +0000 Subject: r23410: Merge the core of the cluster code. I'm 100% certain I've forgotten to merge something, but the main code should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and messages_ctdbd.c. There should be no changes to the non-cluster case, it does survive make test on my laptop. It survives some very basic tests with ctdbd enables, I did not do the full test suite for clusters yet. Phew... Volker (This used to be commit 15553d6327a3aecdd2b0b94a3656d04bf4106323) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9c7b3d1c1f..20a693d64b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -702,6 +702,8 @@ typedef int BOOL; #include "rpc_client.h" #include "event.h" #include "dbwrap.h" +#include "packet.h" +#include "ctdbd_conn.h" /* * Type for wide character dirent structure. -- cgit From aa4110e6f2432d76926198ce7a2a4adea4e1860a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 15 Jun 2007 21:38:10 +0000 Subject: r23509: This activates the global options from the registry in loadparm. The global options are stored as values in the subkey "global" of the SMBCONF registry key. The activation is accomplished in smb.conf though a new special semantic of the "include" parameter: "include = registry" triggers the processing of the registry global options exactly at the position of the include statement. Options read from the registry take the same precedence as parameters loaded from a file via include. Need to reload the registry globals is detected by watching the tdb sequence number. Registry shares are automatically activated when the registry globals are processed. So a "registry only" configuration can be realized by an smb.conf that looks as follows: ================================ [global] include = registry ================================ The global options and registry shares can be conveniently edited with the "net conf" utility. Caveat: A possible pitfall consists in using "include = registry" together with the "lock directory" directive in the registry. This problem will be addressed in the next time. Note on the code: Processing of the registry options is accomplished by a function process_registry_globals() in loadparm.c The current version is only an interim solution: It is handcoded instead of using the infrastructure of reg_api.c. The reason for this is that using reg_api still has too large linker dependencies, bloating virtually all targets by PASSDB_OBJ, SMBLDAP_OBJ, GROUPDB_OBJ and LDB stuff. A version of process_registry_globals that uses reg_api is included but commented out. The goal is to eventually refactor and restructure the registry code so that one can use the reg_api to access only the registry tdb and not link all the dynamic backends with all their linking implications. (This used to be commit 24b0cbcb3741dd14b04728448a85cc04a057e7d0) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 20a693d64b..3994d3b3c9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -681,6 +681,7 @@ typedef int BOOL; #include "rpc_lsa.h" #include "rpc_netlogon.h" #include "reg_objects.h" +#include "reg_db.h" #include "rpc_samr.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" -- cgit From c66831e04b468743df8993edc68cd72ebb4a391d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 22 Jun 2007 11:20:37 +0000 Subject: r23582: Fix event based krb5 ticket refreshing in winbindd. We were incorrectly using the renew_till timestamp instead of the renewed ticket's endtime to calculate the next refreshing date. Guenther (This used to be commit aa3511a5b5e6a96a02110a7ad0ab1d43e6d25766) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 3994d3b3c9..895cc58cec 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1184,7 +1184,7 @@ BOOL smb_krb5_principal_compare_any_realm(krb5_context context, int cli_krb5_get_ticket(const char *principal, time_t time_offset, DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname, time_t *tgs_expire); PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); -krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *new_start_time); +krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time); krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code); krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr); krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr); -- cgit From df63172ad9b6460dc05bead8629b78b9a44f5b7c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 29 Jun 2007 08:56:35 +0000 Subject: r23646: Generalize our internal keytab handling to support a broader range of default keytabnames (like "ANY:FILE:/etc/krb5.keytab,krb4:/etc/srvtab"). This also fixes keytab support with Heimdal (which supports the WRFILE pragma as well now). Guenther (This used to be commit 7ca002f4cc9ec4139c0c48952ebf05f89b5795ef) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 895cc58cec..8babc30b63 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1206,6 +1206,10 @@ krb5_enctype smb_get_enctype_from_kt_entry(const krb5_keytab_entry *kt_entry); krb5_error_code smb_krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **etype_s); +krb5_error_code smb_krb5_open_keytab(krb5_context context, + const char *keytab_name, + BOOL write_access, + krb5_keytab *keytab); #endif /* HAVE_KRB5 */ -- cgit From 24ebb4b1b62fbb8f9d523708da6c330068a97015 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Fri, 6 Jul 2007 17:48:19 +0000 Subject: r23732: removed reference to non-existent structure (This used to be commit 4c04059f7dfa0096c9f3249b55269f7335137f48) --- source3/include/includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8babc30b63..ebcb071b1c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -755,8 +755,6 @@ struct functable2 { struct printjob; -struct smb_ldap_privates; - /* forward declarations from smbldap.c */ #include "smbldap.h" -- cgit From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:25:36 +0000 Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index ebcb071b1c..f60d0895b1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -8,7 +8,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, -- cgit From 5e54558c6dea67b56bbfaba5698f3a434d3dffb6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 00:52:41 +0000 Subject: r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text (This used to be commit b0132e94fc5fef936aa766fb99a306b3628e9f07) --- source3/include/includes.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index f60d0895b1..1a930f8f9b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -17,8 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ /* work around broken krb5.h on sles9 */ -- cgit From e4b268b2b5c732e3d17bfbd266f4b30b56a0dc75 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 19 Jul 2007 13:37:49 +0000 Subject: r23971: Prevent build failures. Guenther (This used to be commit f959a0f152956429d8b525a55f99cbe2963504d6) --- source3/include/includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 1a930f8f9b..238612a438 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1207,7 +1207,11 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context, const char *keytab_name, BOOL write_access, krb5_keytab *keytab); - +NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx, + const char *name, + const char *pass, + time_t time_offset, + PAC_DATA **pac_ret); #endif /* HAVE_KRB5 */ -- cgit From 9342df70273f7c52ba1c6015c7e4addff7f78a4f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 10 Aug 2007 09:44:13 +0000 Subject: r24304: patch from Bjoern JAcke : attached patches add EA support for Solaris. If no one disagrees, can someone check this in please? metze (This used to be commit 81e5afc363e1f0bdc4768c0f5c696f4152fe5b44) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 238612a438..7747f97970 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -224,6 +224,10 @@ typedef int ber_int_t; #include #endif +#ifndef ENOATTR +#define ENOATTR ENODATA +#endif + /* mutually exclusive (SuSE 8.2) */ #if HAVE_ATTR_XATTR_H #include -- cgit From a573b80df7514821c2ea26144e91ce90ec1a58ed Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 14 Aug 2007 15:31:36 +0000 Subject: r24419: Hm, I think this protoype is not required here. Guenther (This used to be commit 42abe8450b0fc3c9f8d768fadbd5e6b0a6c1bfc3) --- source3/include/includes.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7747f97970..a5c6eec33d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1211,11 +1211,6 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context, const char *keytab_name, BOOL write_access, krb5_keytab *keytab); -NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx, - const char *name, - const char *pass, - time_t time_offset, - PAC_DATA **pac_ret); #endif /* HAVE_KRB5 */ -- cgit From 929e1d99209e20a9c2c95c8bdfc8eaa37b2c2291 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 30 Aug 2007 19:48:31 +0000 Subject: r24809: Consolidate the use of temporary talloc contexts. This adds the two functions talloc_stackframe() and talloc_tos(). * When a new talloc stackframe is allocated with talloc_stackframe(), then * the TALLOC_CTX returned with talloc_tos() is reset to that new * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse * happens: The previous talloc_tos() is restored. * * This API is designed to be robust in the sense that if someone forgets to * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and * resets the talloc_tos(). The original motivation for this patch was to get rid of the sid_string_static & friends buffers. Explicitly passing talloc context everywhere clutters code too much for my taste, so an implicit talloc_tos() is introduced here. Many of these static buffers are replaced by a single static pointer. The intended use would thus be that low-level functions can rather freely push stuff to talloc_tos, the upper layers clean up by freeing the stackframe. The more of these stackframes are used and correctly freed the more exact the memory cleanup happens. This patch removes the main_loop_talloc_ctx, tmp_talloc_ctx and lp_talloc_ctx (did I forget any?) So, never do a tmp_ctx = talloc_init("foo"); anymore, instead, use tmp_ctx = talloc_stackframe() :-) Volker (This used to be commit 6585ea2cb7f417e14540495b9c7380fe9c8c717b) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a5c6eec33d..5bb7227d0b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -708,6 +708,7 @@ typedef int BOOL; #include "dbwrap.h" #include "packet.h" #include "ctdbd_conn.h" +#include "talloc_stack.h" /* * Type for wide character dirent structure. -- cgit From 85d1b13fbe263ae68a192a94bd8be43fee601348 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Sep 2007 12:54:53 +0000 Subject: r25128: _XOPEN_SOURCE_EXTENDED and socklen_t are always provided by libreplace metze (This used to be commit b3ee9adf28ee8136528d0236a3a2c894c2223053) --- source3/include/includes.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5bb7227d0b..4f11e7a093 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -303,12 +303,6 @@ typedef sig_atomic_t VOLATILE SIG_ATOMIC_T; typedef int VOLATILE SIG_ATOMIC_T; #endif -#ifndef HAVE_SOCKLEN_T_TYPE -#define HAVE_SOCKLEN_T_TYPE -typedef int socklen_t; -#endif - - #ifndef uchar #define uchar unsigned char #endif -- cgit From 3fbd1ae54ced2eb889a8fe0a6ea32dfd8175f941 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 2 Oct 2007 19:27:25 +0000 Subject: r25472: Fix the interfaces code to detect IPv6 interfaces, using the new standard getifaddrs() and freeifaddrs() interfaces. Currently we only return IPv4 af_families. Needs fixing for binds to IPv6 but this has to be careful work. Jeremy. (This used to be commit 327875182c9219aeba687e10aaea93546d9a70ea) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4f11e7a093..b084eed40c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1262,4 +1262,8 @@ void exit_server_fault(void) NORETURN_ATTRIBUTE ; #include "libnscd.h" #endif +#ifndef HAVE_SA_FAMILY_T +typedef unsigned short int sa_family_t; +#endif + #endif /* _INCLUDES_H */ -- cgit From c7da0dced68ec12a689effcc9c7351b46a815831 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 2 Oct 2007 20:04:14 +0000 Subject: r25474: Try and fix the build on Mac OS X 10.4.9. Shuffle sa_family_t around. Jeremy. (This used to be commit f1b8c5de0ae96e04e340029f5cd544de9ac57b32) --- source3/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b084eed40c..4f11e7a093 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1262,8 +1262,4 @@ void exit_server_fault(void) NORETURN_ATTRIBUTE ; #include "libnscd.h" #endif -#ifndef HAVE_SA_FAMILY_T -typedef unsigned short int sa_family_t; -#endif - #endif /* _INCLUDES_H */ -- cgit From e5a951325a6cac8567af3a66de6d2df577508ae4 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Wed, 10 Oct 2007 15:34:30 -0500 Subject: [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch. (This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4f11e7a093..a57891b763 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -680,6 +680,7 @@ typedef int BOOL; #include "reg_objects.h" #include "reg_db.h" #include "rpc_samr.h" +#include "rpc_srvsvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" #include "rpc_ds.h" @@ -782,6 +783,8 @@ enum flush_reason_enum { #include "librpc/gen_ndr/srv_svcctl.h" #include "librpc/gen_ndr/srv_lsa.h" #include "librpc/gen_ndr/srv_eventlog.h" +#include "librpc/gen_ndr/srv_winreg.h" +#include "librpc/gen_ndr/srv_initshutdown.h" /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H -- cgit From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/include/includes.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a57891b763..0d51c3d049 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -608,11 +608,6 @@ struct timespec { #define MAX(a,b) ((a)>(b)?(a):(b)) #endif -#ifndef _UPPER_BOOL -typedef int BOOL; -#define _UPPER_BOOL -#endif - #ifdef HAVE_BROKEN_GETGROUPS #define GID_T int #else @@ -1131,18 +1126,18 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); -BOOL get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); +bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); #if defined(HAVE_KRB5_LOCATE_KDC) krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); #endif krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); -BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); +bool get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, bool remote); krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry); krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype); void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype); -BOOL kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2); +bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2); void kerberos_free_data_contents(krb5_context context, krb5_data *pdata); NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx, DATA_BLOB *pac_data_blob, @@ -1177,7 +1172,7 @@ krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context, krb5_error_code smb_krb5_parse_name_norealm(krb5_context context, const char *name, krb5_principal *principal); -BOOL smb_krb5_principal_compare_any_realm(krb5_context context, +bool smb_krb5_principal_compare_any_realm(krb5_context context, krb5_const_principal princ1, krb5_const_principal princ2); int cli_krb5_get_ticket(const char *principal, time_t time_offset, @@ -1207,7 +1202,7 @@ krb5_error_code smb_krb5_enctype_to_string(krb5_context context, char **etype_s); krb5_error_code smb_krb5_open_keytab(krb5_context context, const char *keytab_name, - BOOL write_access, + bool write_access, krb5_keytab *keytab); #endif /* HAVE_KRB5 */ -- cgit From f88b7a076be74a29a3bf876b4e2705f4a1ecf42b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 24 Oct 2007 14:16:54 -0700 Subject: This is a large patch (sorry). Migrate from struct in_addr to struct sockaddr_storage in most places that matter (ie. not the nmbd and NetBIOS lookups). This passes make test on an IPv4 box, but I'll have to do more work/testing on IPv6 enabled boxes. This should now give us a framework for testing and finishing the IPv6 migration. It's at the state where someone with a working IPv6 setup should (theorecically) be able to type : smbclient //ipv6-address/share and have it work. Jeremy. (This used to be commit 98e154c3125d5732c37a72d74b0eb5cd7b6155fd) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0d51c3d049..fc9e43e55b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1123,7 +1123,7 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); #endif /* Samba wrapper function for krb5 functionality. */ -void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); +void setup_kaddr_v4( krb5_address *pkaddr, struct sockaddr *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); -- cgit From 32dd016353355acfb71dd773187076f95ff6e86e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 29 Oct 2007 15:03:36 -0700 Subject: Fix the setup_kaddr() call to cope with IPv6. This is the last obvious change I can see. At this point we can start claiming IPv6 support (Hurrah !:-). Jeremy. (This used to be commit bda8c0bf571c994b524a9d67eebc422033d17094) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fc9e43e55b..b9e77010de 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1123,7 +1123,7 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); #endif /* Samba wrapper function for krb5 functionality. */ -void setup_kaddr_v4( krb5_address *pkaddr, struct sockaddr *paddr); +bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); -- cgit From d40e47db4b5da41c8604a2058f3a0b0a82164f08 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 Nov 2007 17:25:45 -0800 Subject: Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b9e77010de..2e82070815 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -892,7 +892,7 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); * defined. */ #ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 254 +#define MAXHOSTNAMELEN 255 #endif /* yuck, I'd like a better way of doing this */ -- cgit From a0ad3a7d64f66cd086d691e4f27e412300a6d96d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 Nov 2007 11:51:33 +0100 Subject: printing: fix default printing subsystem detection "system/printing.h" includes an outdated copy of the stuff in samba3's includes.h, so we should not use it. metze (This used to be commit 0a7338abfabaf31c2cbd81fb4ac8f1ce45735bed) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 2e82070815..5192c37901 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -106,7 +106,6 @@ #include "system/locale.h" #include "system/network.h" #include "system/passwd.h" -#include "system/printing.h" #include "system/readline.h" #include "system/select.h" #include "system/shmem.h" -- cgit From b9342eaaa6bf61f559e4173d7ea58acc1a0a9705 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 3 Dec 2007 15:19:22 -0800 Subject: Remove unused wpstring and macros. Stop using pstrcpy in smbd/*.c Jeremy. (This used to be commit e72bce5b62fb0a9d0ff4a3d76490219994f303cf) --- source3/include/includes.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5192c37901..9079c3aa82 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -699,29 +699,6 @@ struct timespec { #include "ctdbd_conn.h" #include "talloc_stack.h" -/* - * Type for wide character dirent structure. - * Only d_name is defined by POSIX. - */ - -typedef struct smb_wdirent { - wpstring d_name; -} SMB_STRUCT_WDIRENT; - -/* - * Type for wide character passwd structure. - */ - -typedef struct smb_wpasswd { - wfstring pw_name; - char *pw_passwd; - uid_t pw_uid; - gid_t pw_gid; - wpstring pw_gecos; - wpstring pw_dir; - wpstring pw_shell; -} SMB_STRUCT_WPASSWD; - /* used in net.c */ struct functable { const char *funcname; -- cgit From 78c6ee0090f4122bc25baaacb5546517ad4b7bc6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 24 Nov 2007 17:27:54 +0100 Subject: Remove some globals (This used to be commit 31d0a846db08d845e6cdfd85def4ac1c34031e02) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 9079c3aa82..22530f76af 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1042,6 +1042,9 @@ int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); +int asprintf_strupper_m(char **strp, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); +char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); + /* we used to use these fns, but now we have good replacements for snprintf and vsnprintf */ #define slprintf snprintf -- cgit From 9e8180b9835fc100c25ef230747f7b44ef03d685 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 Dec 2007 12:02:44 -0800 Subject: Remove pstrings completely except for smbctool (what does this do ?). Don't build this for now. Jeremy. (This used to be commit 46b67fd82c795d1a34a1efca9e409c0f3fa4f3a2) --- source3/include/includes.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 22530f76af..67995fa499 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -617,8 +617,9 @@ struct timespec { #define NGROUPS_MAX 32 /* Guess... */ #endif -/* Our own pstrings and fstrings */ -#include "pstring.h" +/* Our own fstrings */ +#define FSTRING_LEN 256 +typedef char fstring[FSTRING_LEN]; /* Lists, trees, caching, database... */ #include "xfile.h" @@ -1033,8 +1034,6 @@ int d_fprintf(FILE *f, const char *, ...) PRINTF_ATTRIBUTE(2,3); /* PRINTFLIKE2 */ void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); -/* PRINTFLIKE2 */ -int pstr_sprintf(pstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); /* PRINTFLIKE2 */ int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); -- cgit From 25288b0e4472c728fc5a3a70c6c3e1f621ffae5f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 Dec 2007 14:54:38 -0800 Subject: A requiem for pstring. -------------- / \ / REST \ / IN \ / PEACE \ / \ | The infamous pstring | | | | | | 7 December | | | | 2007 | *| * * * | * _________)/\\_//(\/(/\)/\//\/\///|_)_______ Jeremy (This used to be commit bca371bff8e1dd5099eda1774e5bb0fdbd6a1a77) --- source3/include/includes.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 67995fa499..c3c9dca9cf 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -618,6 +618,24 @@ struct timespec { #endif /* Our own fstrings */ + +/* + -------------- + / \ + / REST \ + / IN \ + / PEACE \ + / \ + | The infamous pstring | + | | + | | + | 7 December | + | | + | 2007 | + *| * * * | * + _________)/\\_//(\/(/\)/\//\/\///|_)_______ +*/ + #define FSTRING_LEN 256 typedef char fstring[FSTRING_LEN]; -- cgit From 6e995e4f8c5884795ad5c524c670c5073f8af359 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 Dec 2007 17:44:42 -0800 Subject: Add define guards around FSTRING_LEN. Jeremy. (This used to be commit ea8633689d43cc2fe15aedb430b4cac38fa73d14) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c3c9dca9cf..4e420881ae 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -636,8 +636,10 @@ struct timespec { _________)/\\_//(\/(/\)/\//\/\///|_)_______ */ +#ifndef FSTRING_LEN #define FSTRING_LEN 256 typedef char fstring[FSTRING_LEN]; +#endif /* Lists, trees, caching, database... */ #include "xfile.h" -- cgit From 12ac4c3119b3b7712e670d95d61413d97ecafaef Mon Sep 17 00:00:00 2001 From: Rishi Srivatsavai Date: Thu, 13 Dec 2007 20:56:29 -0800 Subject: Register the smb service with mDNS if mSDN is supported. If mDNS is supported, attempt to register the first port we are listening on for the _smb._tcp service. This provides more reliable service discovery than NetBIOS browsing. (This used to be commit 1e7241517d1f55d60af22570e0c9feb280e3fdb5) --- source3/include/includes.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 4e420881ae..22451741a1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -752,6 +752,20 @@ struct printjob; #include "smb_ldap.h" +struct dns_reg_state; + +void dns_register_smbd(struct dns_reg_state ** dns_state_ptr, + unsigned port, + int *maxfd, + fd_set *listen_set, + struct timeval *timeout); + +void dns_register_close(struct dns_reg_state ** dns_state_ptr); + + +bool dns_register_smbd_reply(struct dns_reg_state *dns_state, + fd_set *lfds, struct timeval *timeout); + /* * Reasons for cache flush. */ -- cgit From f427d4ce65659419c8989d87acd97d00b4db41e6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 18 Dec 2007 09:41:03 +0100 Subject: Add a in-memory cache This is a more general API that caches data with a LRU scheme. See include/cache.h. No comments yet, I'm still working on it. But Jeremy has given me a hint in one of his checkins that he would like to make use of this now. The idea is that we get rid of all our silly little caches and merge them all into one cache that we can then very easily trim, for example even with a smbcontrol message if someone decides memory is tight. The main user is the stat cache, this patch also converts the getwd cache. More caches to come. (This used to be commit 7a911b35713538d82001a3c9f34152e293fe1943) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 22451741a1..a45176aba3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -719,6 +719,7 @@ typedef char fstring[FSTRING_LEN]; #include "packet.h" #include "ctdbd_conn.h" #include "talloc_stack.h" +#include "cache.h" /* used in net.c */ struct functable { -- cgit From 712a28aaae6671be673f9b125cae59aec628d267 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 19 Dec 2007 15:45:22 +0100 Subject: Rename cache.[ch] to memcache.[ch] cache.h conflicts with an XFS DMAPI include on "opi" :-( (This used to be commit b8db804e07cc19d406ba3892d6eecbe16132a89a) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a45176aba3..fdeff346e5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -719,7 +719,7 @@ typedef char fstring[FSTRING_LEN]; #include "packet.h" #include "ctdbd_conn.h" #include "talloc_stack.h" -#include "cache.h" +#include "memcache.h" /* used in net.c */ struct functable { -- cgit From 59ce7650f24eb7c35b8d3ee9f830711a4af8f8e9 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Fri, 21 Dec 2007 11:59:56 -0600 Subject: De-couple smbd from staticly linking against winbindd client files. Implements a wrapper layer in winbind_util.c which are just stubs if compiled --without-winbind. When building with winbindd, it is now required to build the libwbclient DSO first (in the Makefile) and then either set LD_LIBRARY_PATH or /etc/ld.so.conf to pick up the library PATH. (This used to be commit 42787bccff4fcffafc7aae6a678e792604ecaaa5) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fdeff346e5..14ef2258e6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -784,6 +784,7 @@ enum flush_reason_enum { NUM_FLUSH_REASONS}; #include "nss_info.h" +#include "nsswitch/libwbclient/wbclient.h" /* generated rpc server implementation functions */ #include "librpc/gen_ndr/srv_echo.h" -- cgit From ba2a2552822ded95358c11972005f2c353580439 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 10 Jan 2008 14:27:52 +0100 Subject: Move transfer_file and transfer_file_internal to a module of their own. Also, don't auto-generate prototypes of the (two) exported functions but make a start in having handwritten prototypes in dedicated header files (not in includes.h ... :-) Michael (This used to be commit 395f29d8b768a56af20b37f185eccdc5f37b68d5) --- source3/include/includes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 14ef2258e6..e9477d8ba1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -811,6 +811,9 @@ enum flush_reason_enum { #include "srvstr.h" #include "safe_string.h" +/* prototypes from lib/util_transfer_file.c */ +#include "transfer_file.h" + #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) #endif -- cgit From 5a48ee89b8527534064439678f98365057912d77 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Jan 2008 13:37:40 +0100 Subject: Fix the build ... forgot to "git add" it (This used to be commit 6d0a727f26dd0945634486f18a55aa8dd5813983) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e9477d8ba1..7eca8d3ddf 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -702,6 +702,7 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/notify.h" +#include "librpc/gen_ndr/xattr.h" #include "nt_printing.h" #include "idmap.h" #include "client.h" -- cgit From 014bfd35f8c57370b27a1d07c335e2d9813a1333 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Jan 2008 00:44:14 +0100 Subject: Some systems do not have XATTR_ defined (This used to be commit 2cac1d3919a96c480f34c93d8b9b07782d46ed23) --- source3/include/includes.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7eca8d3ddf..c6d0885ad9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1108,6 +1108,14 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT #define VXFS_QUOTA #endif +#ifndef XATTR_CREATE +#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ +#endif + +#ifndef XATTR_REPLACE +#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ +#endif + #if defined(HAVE_KRB5) krb5_error_code smb_krb5_parse_name(krb5_context context, -- cgit From 80b2e330f939d9877352f8fbdbec3a4e0e395c7b Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 29 Jan 2008 17:49:38 +0100 Subject: Remove include/rpc_ds.h and all references to it completly. Jerry, please have a look if you're fine with that. Guenther (This used to be commit beae25c808a3a03d645f247e9befcd05e3ecca2c) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c6d0885ad9..b7fcc10ab1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -698,7 +698,6 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_srvsvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" -#include "rpc_ds.h" #include "rpc_perfcount.h" #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/notify.h" -- cgit From d49754944c8159b13cb25c25023db99ac7aa2e16 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 1 Feb 2008 13:04:10 +0100 Subject: NetBSD defines innetgr() in (This used to be commit 7ad8e22073b577cd454675bacf92549e81f55e1c) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index b7fcc10ab1..041c431a58 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -250,6 +250,10 @@ typedef int ber_int_t; #include #endif +#if HAVE_NETGROUP_H +#include +#endif + #if defined(HAVE_AIO_H) && defined(WITH_AIO) #include #endif -- cgit From c1793b2b316a8f912dde14f806c84ac7d1491bf3 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sun, 17 Feb 2008 01:59:02 +0100 Subject: Use new IDL based PAC structures in clikrb5.c Guenther (This used to be commit 3b0135d57e1e70175a5eec49b603a2e5f700c770) --- source3/include/includes.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 041c431a58..02edbb0401 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1170,15 +1170,15 @@ bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, k void kerberos_free_data_contents(krb5_context context, krb5_data *pdata); NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx, DATA_BLOB *pac_data_blob, - krb5_context context, + krb5_context context, krb5_keyblock *service_keyblock, krb5_const_principal client_principal, time_t tgs_authtime, - PAC_DATA **pac_data); + struct PAC_DATA **pac_data_out); void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum, - PAC_SIGNATURE_DATA *sig); + struct PAC_SIGNATURE_DATA *sig); krb5_error_code smb_krb5_verify_checksum(krb5_context context, - krb5_keyblock *keyblock, + const krb5_keyblock *keyblock, krb5_keyusage usage, krb5_checksum *cksum, uint8 *data, @@ -1206,7 +1206,6 @@ bool smb_krb5_principal_compare_any_realm(krb5_context context, krb5_const_principal princ2); int cli_krb5_get_ticket(const char *principal, time_t time_offset, DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname, time_t *tgs_expire); -PAC_LOGON_INFO *get_logon_info_from_pac(PAC_DATA *pac_data); krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time); krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code); krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr); -- cgit From 42f5c6d20cfc728344fc5f9ecf9407bb10d77896 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 27 Feb 2008 16:54:01 +0100 Subject: Remove unneeded rpc_samr.h. Guenther (This used to be commit e6701352dc2cd4ff9cc7d04db6f1975594477cdb) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 02edbb0401..a2c3a0c466 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -698,7 +698,6 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_netlogon.h" #include "reg_objects.h" #include "reg_db.h" -#include "rpc_samr.h" #include "rpc_srvsvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" -- cgit From 93e06129abf02fa445830955f33d981a407dc17d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 28 Feb 2008 13:55:53 +0100 Subject: Add basic infrastructure for general async requests (This used to be commit ae254cb61f4b9331755848c47ebc34e90dd80390) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index a2c3a0c466..8b94d7aed2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -723,6 +723,7 @@ typedef char fstring[FSTRING_LEN]; #include "ctdbd_conn.h" #include "talloc_stack.h" #include "memcache.h" +#include "async_req.h" /* used in net.c */ struct functable { -- cgit From 1d41b5bd2a58dcc6966a3a49ccb063ff05e46125 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 28 Feb 2008 14:41:25 +0100 Subject: Add infrastructure to support async SMB requests (This used to be commit f5356825698a02df2d400b51dd95d1f857c83e81) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b94d7aed2..269baa5a9c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -724,6 +724,7 @@ typedef char fstring[FSTRING_LEN]; #include "talloc_stack.h" #include "memcache.h" #include "async_req.h" +#include "async_smb.h" /* used in net.c */ struct functable { -- cgit From e9c2515df0ac92e275da3dcd62de6cc50009bf6e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 29 Feb 2008 13:35:16 +0100 Subject: Eliminate tons of build warnings on non-IPV6 system. Michael (This used to be commit ee4810099c2d26a0ebab3c41a95bc6b57921683d) --- source3/include/includes.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 269baa5a9c..36c71d7533 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1289,4 +1289,9 @@ void exit_server_fault(void) NORETURN_ATTRIBUTE ; #include "libnscd.h" #endif +#if defined(HAVE_IPV6) +void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss, + struct in6_addr ip); +#endif + #endif /* _INCLUDES_H */ -- cgit From 45a877f392a5449f4c3b7d39f9f8c78b57733d39 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 1 Mar 2008 09:26:27 +0100 Subject: Revert "Add infrastructure to support async SMB requests" This reverts commit f5356825698a02df2d400b51dd95d1f857c83e81. (This used to be commit 5f53a62be8a21b8d92ac44b18d202882500356e8) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 36c71d7533..8d4bfc0f8e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -724,7 +724,6 @@ typedef char fstring[FSTRING_LEN]; #include "talloc_stack.h" #include "memcache.h" #include "async_req.h" -#include "async_smb.h" /* used in net.c */ struct functable { -- cgit From c3cb59ae2b7dc5d89e57ea9d674d256637f891fd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 1 Mar 2008 09:26:43 +0100 Subject: Revert "Add basic infrastructure for general async requests" This reverts commit ae254cb61f4b9331755848c47ebc34e90dd80390. (This used to be commit 030bef7f22f7a73466204b7860f397dbca9f2ab0) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8d4bfc0f8e..c54afd8933 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -723,7 +723,6 @@ typedef char fstring[FSTRING_LEN]; #include "ctdbd_conn.h" #include "talloc_stack.h" #include "memcache.h" -#include "async_req.h" /* used in net.c */ struct functable { -- cgit From f05bc403899e25c4299a23f09dde9bad5f4bcc66 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 28 Feb 2008 13:55:53 +0100 Subject: Add basic infrastructure for general async requests (This used to be commit 9f8b2a87ee8bba930b776dcfda608a5639f6d55a) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c54afd8933..8d4bfc0f8e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -723,6 +723,7 @@ typedef char fstring[FSTRING_LEN]; #include "ctdbd_conn.h" #include "talloc_stack.h" #include "memcache.h" +#include "async_req.h" /* used in net.c */ struct functable { -- cgit From 1ea0a5d0cdaf9cbc1d1a5c0720ae466f07cea816 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 28 Feb 2008 14:41:25 +0100 Subject: Add infrastructure to support async SMB requests (This used to be commit e2153301351559f30f2714345f4c1ca6c5f1a45f) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8d4bfc0f8e..36c71d7533 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -724,6 +724,7 @@ typedef char fstring[FSTRING_LEN]; #include "talloc_stack.h" #include "memcache.h" #include "async_req.h" +#include "async_smb.h" /* used in net.c */ struct functable { -- cgit From 670418c1165f0a149bfdd4bcdc5bde575df43ef2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 17 Mar 2008 17:29:44 +0100 Subject: Move libnet_conf to a library lib/smbconf/ of its own, fixing the api. The libnet_conf code to access the registry based configuration has become more of a library used in several places in samba (e.g. loadparm) than an abstraction of "net conf". So I move it to a location lib/smbconf/. In the same breath, the api is fixed (not generated by make proto anymore). Michael (This used to be commit 5315ef41f403b96715dd68b512e9e74662e2910a) --- source3/include/includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 36c71d7533..c56c3cfd18 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -726,6 +726,8 @@ typedef char fstring[FSTRING_LEN]; #include "async_req.h" #include "async_smb.h" +#include "lib/smbconf/smbconf.h" + /* used in net.c */ struct functable { const char *funcname; -- cgit From 5fdf4b8f4ae41bc44cdbfa6ac82d857c3dd955c1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 21 Mar 2008 04:12:52 +0100 Subject: Remove remaining old srvsvc client and server rpc code entirely. Guenther (This used to be commit a5f0186f70abe8dba650265219e69ce5ca2fb642) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c56c3cfd18..15a74849a9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -698,7 +698,6 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_netlogon.h" #include "reg_objects.h" #include "reg_db.h" -#include "rpc_srvsvc.h" #include "rpc_spoolss.h" #include "rpc_eventlog.h" #include "rpc_perfcount.h" -- cgit From de34a7d30347772a32813775a6aead07462eaa96 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 27 Mar 2008 21:58:11 +0100 Subject: Remove unused marshalling for Netlogon Lockout String. Guenther (This used to be commit d87133d0516294e7d5f123e3bb2e93c179c72677) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 15a74849a9..0b3565f632 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -695,7 +695,6 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_svcctl.h" #include "rpc_ntsvcs.h" #include "rpc_lsa.h" -#include "rpc_netlogon.h" #include "reg_objects.h" #include "reg_db.h" #include "rpc_spoolss.h" -- cgit From 3db2249886bf19be4c357a0966d9efa2f2e692f6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 15 Apr 2008 17:55:44 +0200 Subject: Add simple implementation of several functions in the Samba 4 RPC library on top of the Samba 3 RPC library: * dcerpc_pipe_connect * dcerpc_ndr_request_recv * dcerpc_ndr_request_send These are the main functions used by the generated client calls in Samba 4. (This used to be commit 350177824239343365d5c99ad4efd71e3b2ed6fa) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0b3565f632..06d41957c9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -703,6 +703,7 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/notify.h" #include "librpc/gen_ndr/xattr.h" +#include "librpc/rpc/dcerpc.h" #include "nt_printing.h" #include "idmap.h" #include "client.h" -- cgit From bcbac69d1a38e128ffe8b763ac027d6eab33dcec Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 21 Apr 2008 19:59:27 +0200 Subject: cldap: avoid duplicate definitions so remove ads_cldap.h. Guenther (This used to be commit 538eefe22ad69540b9f73ffaa613d6be045de199) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 06d41957c9..70e1b48fa1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -673,7 +673,6 @@ typedef char fstring[FSTRING_LEN]; #include "messages.h" #include "locking.h" #include "smb.h" -#include "ads_cldap.h" #include "nameserv.h" #include "secrets.h" #include "byteorder.h" -- cgit From f5769109447d8da0f09b102d444a816ad97a00dc Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Fri, 9 May 2008 23:22:12 +0200 Subject: net: Remove globals (This used to be commit 1e9319cf88b65a2a8d4f5099a1fe5297e405ed2e) --- source3/include/includes.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 70e1b48fa1..d9c699a439 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -727,14 +727,16 @@ typedef char fstring[FSTRING_LEN]; #include "lib/smbconf/smbconf.h" /* used in net.c */ +struct net_context; + struct functable { const char *funcname; - int (*fn)(int argc, const char **argv); + int (*fn)(struct net_context *c, int argc, const char **argv); }; struct functable2 { const char *funcname; - int (*fn)(int argc, const char **argv); + int (*fn)(struct net_context *c, int argc, const char **argv); const char *helptext; }; -- cgit From 4d9748e44dc58e026136ce0c28526ba4cf1d4f3e Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Wed, 21 May 2008 10:47:59 +0200 Subject: net: Move includes to net.h (This used to be commit 1943e2752d4dcb5bbbd4e40cf854efba4aed8f45) --- source3/include/includes.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d9c699a439..adbf8f791d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -726,20 +726,6 @@ typedef char fstring[FSTRING_LEN]; #include "lib/smbconf/smbconf.h" -/* used in net.c */ -struct net_context; - -struct functable { - const char *funcname; - int (*fn)(struct net_context *c, int argc, const char **argv); -}; - -struct functable2 { - const char *funcname; - int (*fn)(struct net_context *c, int argc, const char **argv); - const char *helptext; -}; - /* Defines for wisXXX functions. */ #define UNI_UPPER 0x1 #define UNI_LOWER 0x2 -- cgit From de7e6e070a95c9543befd95f6f5576f056a701a7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 12 Jun 2008 12:36:15 +0200 Subject: AIX build fixes from William Jojo -- thanks (cherry picked from commit cb91a47576e820390bc62195702aaae93a2feba6) (This used to be commit 90d7bc6da3c92e104fadd5965a730fbe01be33d5) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index adbf8f791d..c937f597cd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -777,6 +777,7 @@ enum flush_reason_enum { NUM_FLUSH_REASONS}; #include "nss_info.h" +#include "modules/nfs4_acls.h" #include "nsswitch/libwbclient/wbclient.h" /* generated rpc server implementation functions */ -- cgit From fd288b4110a988ef37f153dfee95381f6675a7ef Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 17 Jun 2008 17:58:38 +0200 Subject: clikrb5: remove unrequired create_kerberos_key_from_string_direct() prototype. Guenther (This used to be commit ec86852fc6ce2d88ad5835c8fcb337c68fd6f6bc) --- source3/include/includes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index c937f597cd..7513dfb6e0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1144,7 +1144,6 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); /* Samba wrapper function for krb5 functionality. */ bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr); int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); -int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); -- cgit From 0ac8c5d49a8b0d5535eebf80871003f6c19af5eb Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 18 Jun 2008 12:45:57 +0200 Subject: kerberos: make smb_krb5_kt_add_entry public, allow to pass keys without salting them. Guenther (This used to be commit 7c4da23be1105dc224033b21eb486e7fcdc7d9c5) --- source3/include/includes.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 7513dfb6e0..61ca937138 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1143,7 +1143,7 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); /* Samba wrapper function for krb5 functionality. */ bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr); -int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); +int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool no_salt); bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); @@ -1221,6 +1221,13 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context, const char *keytab_name, bool write_access, krb5_keytab *keytab); +int smb_krb5_kt_add_entry(krb5_context context, + krb5_keytab keytab, + krb5_kvno kvno, + const char *princ_s, + krb5_enctype *enctypes, + krb5_data password, + bool no_salt); #endif /* HAVE_KRB5 */ -- cgit From 640a2972c555a456ea9a083bdc7aae8ea283492a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 18 Jun 2008 12:48:35 +0200 Subject: kerberos: add smb_krb5_keytab_name(). Guenther (This used to be commit c273ce8798062d1b55100411f3e92a01bdbf611c) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 61ca937138..d3e8b3350d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1221,6 +1221,10 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context, const char *keytab_name, bool write_access, krb5_keytab *keytab); +krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx, + krb5_context context, + krb5_keytab keytab, + const char **keytab_name); int smb_krb5_kt_add_entry(krb5_context context, krb5_keytab keytab, krb5_kvno kvno, -- cgit From 52635c6f58edaa0e948851fd3f06b95d05ab10a4 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 30 Jun 2008 10:29:15 +0200 Subject: kerberos: rename smb_krb5_kt_add_entry to smb_krb5_kt_add_entry_ext. Guenther (This used to be commit 48600a0019d70d22574cf08e8fe19d44cc332a0f) --- source3/include/includes.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index d3e8b3350d..e9addf6ee0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1225,13 +1225,14 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx, krb5_context context, krb5_keytab keytab, const char **keytab_name); -int smb_krb5_kt_add_entry(krb5_context context, - krb5_keytab keytab, - krb5_kvno kvno, - const char *princ_s, - krb5_enctype *enctypes, - krb5_data password, - bool no_salt); +int smb_krb5_kt_add_entry_ext(krb5_context context, + krb5_keytab keytab, + krb5_kvno kvno, + const char *princ_s, + krb5_enctype *enctypes, + krb5_data password, + bool no_salt); + #endif /* HAVE_KRB5 */ -- cgit From 16e44ee1126a5126346689785d240ac37a32fad7 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 30 Jun 2008 10:32:15 +0200 Subject: kerberos: allow to keep entries with old kvno's while creating keytab. Guenther (This used to be commit 6194244bd9fcc1fb736f3d91433f107270cac1c9) --- source3/include/includes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index e9addf6ee0..aa99dc0b63 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1231,7 +1231,8 @@ int smb_krb5_kt_add_entry_ext(krb5_context context, const char *princ_s, krb5_enctype *enctypes, krb5_data password, - bool no_salt); + bool no_salt, + bool keep_old_entries); #endif /* HAVE_KRB5 */ -- cgit From b67def0a55cfd15bdfca8e22380cc32a654faaba Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 8 Aug 2008 18:30:57 +0200 Subject: Add simple async wrappers around send, recv and connect To be used later :-) (This used to be commit 0d161d336ab9eeccd90d19ef1473646c3008864a) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index aa99dc0b63..8eb0ee52dd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -723,6 +723,7 @@ typedef char fstring[FSTRING_LEN]; #include "memcache.h" #include "async_req.h" #include "async_smb.h" +#include "async_sock.h" #include "lib/smbconf/smbconf.h" -- cgit From 7871fa0b69467eacbf9add9e4670a0faae10184d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Aug 2008 15:28:38 +0200 Subject: Put prototypes of modules/vfs_posixacl.c into new modules/vfs_posixacl.h. Michael (This used to be commit 876f6793434174051084b17f3b02bd1bbb24ec44) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8eb0ee52dd..244571983c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -794,6 +794,10 @@ enum flush_reason_enum { #include "proto.h" #endif +#if defined(HAVE_POSIX_ACLS) +#include "modules/vfs_posixacl.h" +#endif + #ifdef HAVE_LDAP #include "ads_protos.h" #endif -- cgit From 14fd4ac3eacbdb19c53580a580c9c9189176554d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Aug 2008 15:31:53 +0200 Subject: Put prototypes of modules/vfs_tru64acl.c to new modules/vfs_tru64acl.h. Thereby (hopefully) fixing the build with tru64 acls. Michael (This used to be commit 1ab64b69850489a2648a2543da6d0e1157df68bc) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 244571983c..0e17c75ef3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -798,6 +798,10 @@ enum flush_reason_enum { #include "modules/vfs_posixacl.h" #endif +#if defined(HAVE_TRU64_ACLS) +#include "modules/vfs_tru64acl.h" +#endif + #ifdef HAVE_LDAP #include "ads_protos.h" #endif -- cgit From 1c72d476ec43f7213447eb44d8334d49e092774e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Aug 2008 15:56:44 +0200 Subject: Put prototypes of modules/vfs_solarisacl.c to new modules/vfs_solarisacl.h. Thereby (hopefully) fixing the potential build problems with solaris acls. Michael (This used to be commit 8413c05afcde65006fa7c8743f30b53cc33c1729) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 0e17c75ef3..fdfcc1ab14 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -802,6 +802,10 @@ enum flush_reason_enum { #include "modules/vfs_tru64acl.h" #endif +#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS) +#include "modules/vfs_solarisacl.h" +#endif + #ifdef HAVE_LDAP #include "ads_protos.h" #endif -- cgit From 34294b31aab2d61fde086f167758499187d15e2a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Aug 2008 15:58:06 +0200 Subject: Put prototypes of modules/vfs_hpuxacl.c to new modules/vfs_hpuxacl.h. Thereby (hopefully) fixing the potential build problems with HPUX acls. Michael (This used to be commit 4f2a1de990dc9063a1db877c06a5c1d68924edcf) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fdfcc1ab14..5acc78839e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -806,6 +806,10 @@ enum flush_reason_enum { #include "modules/vfs_solarisacl.h" #endif +#if defined(HAVE_HPUX_ACLS) +#include "modules/vfs_hpuxacl.h" +#endif + #ifdef HAVE_LDAP #include "ads_protos.h" #endif -- cgit From 4136ab3c983f08536ee8aa49c0fed60bd95b6096 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Aug 2008 15:59:14 +0200 Subject: Put prototypes of modules/vfs_irixacl.c to new modules/vfs_irixacl.h. Thereby (hopefully) fixing the potential build problems with IRIX acls. Michael (This used to be commit 61c201d416bbc37950b980e8598b7ef1292336bc) --- source3/include/includes.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5acc78839e..fa385cba2a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -810,6 +810,10 @@ enum flush_reason_enum { #include "modules/vfs_hpuxacl.h" #endif +#if defined(HAVE_IRIX_ACLS) +#include "modules/vfs_irixacl.h" +#endif + #ifdef HAVE_LDAP #include "ads_protos.h" #endif -- cgit From bff20e14c38d7139033127182b76aa24e471b581 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 22 Aug 2008 14:58:01 +0200 Subject: kerberos: use KRB5_KT_KEY macro where appropriate. Guenther (This used to be commit a042dffd7121bda3dbc9509f69fcfae06ed4cc22) --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index fa385cba2a..958e7cba1f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1234,7 +1234,7 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, krb5_error_code error_code, const krb5_principal server, krb5_data *reply); -krb5_enctype smb_get_enctype_from_kt_entry(const krb5_keytab_entry *kt_entry); +krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry); krb5_error_code smb_krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **etype_s); -- cgit From 3f41545b61723f076c41e446cfec90fd08bd16ae Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 15:13:22 +0200 Subject: messaging: move types to IDL. Guenther (This used to be commit 6c346d0eb20af5ba9b09f30319420f7c91480da6) --- source3/include/includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 958e7cba1f..9c5ea08f6d 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -702,6 +702,7 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/notify.h" #include "librpc/gen_ndr/xattr.h" +#include "librpc/gen_ndr/messaging.h" #include "librpc/rpc/dcerpc.h" #include "nt_printing.h" #include "idmap.h" -- cgit