From 6bd02aa5046b606171a680e6f8aefba31b744af1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 11:42:35 +0000 Subject: r3478: split out some more pieces of includes.h (This used to be commit 8e9212ecfc61c509f686363d8ec412ce54bc1c8d) --- source4/include/system/filesys.h | 12 +++++++++++ source4/include/system/network.h | 9 +++++++++ source4/include/system/passwd.h | 29 +++++++++++++++++++++------ source4/include/system/printing.h | 42 +++++++++++++++++++++++++++++++++++++++ source4/include/system/shmem.h | 4 ++++ source4/include/system/terminal.h | 6 ++++++ source4/include/system/time.h | 4 ++++ source4/include/system/wait.h | 4 ++++ 8 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 source4/include/system/printing.h (limited to 'source4/include/system') diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h index 07465c1c56..60d2910ba0 100644 --- a/source4/include/system/filesys.h +++ b/source4/include/system/filesys.h @@ -180,3 +180,15 @@ int rename(const char *zfrom, const char *zto); #define UINT16_MAX 65535 #endif +#ifndef HAVE_FTRUNCATE +int ftruncate(int f,long l); +#endif + +#ifndef MAXPATHLEN +#define MAXPATHLEN 256 +#endif + +#ifndef SEEK_SET +#define SEEK_SET 0 +#endif + diff --git a/source4/include/system/network.h b/source4/include/system/network.h index dfecd59090..bad4339666 100644 --- a/source4/include/system/network.h +++ b/source4/include/system/network.h @@ -81,3 +81,12 @@ #ifndef HAVE_SOCKLEN_T_TYPE typedef int socklen_t; #endif + +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK 0x7f000001 +#endif + +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + diff --git a/source4/include/system/passwd.h b/source4/include/system/passwd.h index 901b1b92f2..8a5402131a 100644 --- a/source4/include/system/passwd.h +++ b/source4/include/system/passwd.h @@ -56,15 +56,32 @@ #define getpass(prompt) getsmbpass((prompt)) #endif -#ifndef HAVE_INITGROUPS -int initgroups(char *name,gid_t id); +#ifndef NGROUPS_MAX +#define NGROUPS_MAX 32 /* Guess... */ #endif -#ifndef HAVE_CRYPT -#define crypt ufc_crypt +/* 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 +#if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS) +#define OSF1_ENH_SEC 1 +#endif -#ifndef NGROUPS_MAX -#define NGROUPS_MAX 32 /* Guess... */ +#ifndef ALLOW_CHANGE_PASSWORD +#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) +#define ALLOW_CHANGE_PASSWORD 1 +#endif #endif + +#if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID) +#define ULTRIX_AUTH 1 +#endif + + +#ifndef HAVE_INITGROUPS +int initgroups(char *name,gid_t id); +#endif + diff --git a/source4/include/system/printing.h b/source4/include/system/printing.h new file mode 100644 index 0000000000..9eb93a776e --- /dev/null +++ b/source4/include/system/printing.h @@ -0,0 +1,42 @@ +/* + Unix SMB/CIFS implementation. + + printing system include wrappers + + Copyright (C) Andrew Tridgell 2004 + + 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. +*/ + +#ifdef AIX +#define DEFAULT_PRINTING PRINT_AIX +#define PRINTCAP_NAME "/etc/qconfig" +#endif + +#ifdef HPUX +#define DEFAULT_PRINTING PRINT_HPUX +#endif + +#ifdef QNX +#define DEFAULT_PRINTING PRINT_QNX +#endif + +#ifndef DEFAULT_PRINTING +#define DEFAULT_PRINTING PRINT_BSD +#endif +#ifndef PRINTCAP_NAME +#define PRINTCAP_NAME "/etc/printcap" +#endif + diff --git a/source4/include/system/shmem.h b/source4/include/system/shmem.h index 49ab291960..e197cd146f 100644 --- a/source4/include/system/shmem.h +++ b/source4/include/system/shmem.h @@ -42,3 +42,7 @@ #endif +#ifndef MAP_FILE +#define MAP_FILE 0 +#endif + diff --git a/source4/include/system/terminal.h b/source4/include/system/terminal.h index abc661d7ac..b727f8e7fa 100644 --- a/source4/include/system/terminal.h +++ b/source4/include/system/terminal.h @@ -20,6 +20,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef SUNOS4 +/* on SUNOS4 termios.h conflicts with sys/ioctl.h */ +#undef HAVE_TERMIOS_H +#endif + + #if defined(HAVE_TERMIOS_H) /* POSIX terminal handling. */ #include diff --git a/source4/include/system/time.h b/source4/include/system/time.h index 132a3e5dfc..7d27a56c9e 100644 --- a/source4/include/system/time.h +++ b/source4/include/system/time.h @@ -35,3 +35,7 @@ #include #endif +#ifndef HAVE_TIMEGM +time_t timegm(struct tm *tm); +#endif + diff --git a/source4/include/system/wait.h b/source4/include/system/wait.h index 6af01986f9..d4c47582ad 100644 --- a/source4/include/system/wait.h +++ b/source4/include/system/wait.h @@ -31,3 +31,7 @@ typedef int sig_atomic_t; #endif +#ifndef SIGCLD +#define SIGCLD SIGCHLD +#endif + -- cgit