- (djm) Merge OpenBSD changes:

[openssh.git] / defines.h

diff --git a/defines.h b/defines.h
index 871adbf4f65c9f759c126757029fdd6c95d3e320..69b8baf276b39cced4f57304d40cfdeab3d8409b 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -6,6 +6,7 @@
 #include <sys/types.h> /* For [u]intxx_t */
 #include <sys/socket.h> /* For SHUT_XXXX */
 #include <sys/param.h> /* For MAXPATHLEN */
+#include <sys/un.h> /* For SUN_LEN */
 #include <netinet/in_systm.h> /* For typedefs */
 #include <netinet/in.h> /* For IPv6 macros */
 #include <netinet/ip.h> /* For IPTOS macros */
@@ -30,6 +31,11 @@
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h> /* For MIN, MAX, etc */
 #endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h> /* For S_* constants and macros */
+#endif
+
+#include <unistd.h> /* For STDIN_FILENO, etc */
 
 /* Constants */
 
@@ -61,10 +67,46 @@ enum
 # endif /* PATH_MAX */
 #endif /* MAXPATHLEN */
 
+#ifndef STDIN_FILENO     
+# define STDIN_FILENO    0
+#endif                   
+#ifndef STDOUT_FILENO    
+# define STDOUT_FILENO   1
+#endif                   
+#ifndef STDERR_FILENO    
+# define STDERR_FILENO   2
+#endif                   
+
+#ifndef S_ISREG
+# define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
+# define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG))
+#endif /* S_ISREG */
+
+#ifndef S_IXUSR
+# define S_IXUSR                       0000100 /* execute/search permission, */
+# define S_IXGRP                       0000010 /* execute/search permission, */
+# define S_IXOTH                       0000001 /* execute/search permission, */
+# define _S_IWUSR                      0000200 /* write permission, */
+# define S_IWUSR                       _S_IWUSR        /* write permission, owner */
+# define S_IWGRP                       0000020 /* write permission, group */
+# define S_IWOTH                       0000002 /* write permission, other */
+# define S_IRUSR                       0000400 /* read permission, owner */
+# define S_IRGRP                       0000040 /* read permission, group */
+# define S_IROTH                       0000004 /* read permission, other */
+# define S_IRWXU                       0000700 /* read, write, execute */
+# define S_IRWXG                       0000070 /* read, write, execute */
+# define S_IRWXO                       0000007 /* read, write, execute */
+#endif /* S_IXUSR */
+
 /* Types */
 
 /* If sys/types.h does not supply intXX_t, supply them ourselves */
 /* (or die trying) */
+
+#ifndef HAVE_U_INT
+typedef unsigned int u_int;
+#endif
+
 #ifndef HAVE_INTXX_T
 # if (SIZEOF_CHAR == 1)
 typedef char int8_t;
@@ -151,6 +193,21 @@ typedef int ssize_t;
 # define HAVE_SSIZE_T
 #endif /* HAVE_SSIZE_T */
 
+#ifndef HAVE_SA_FAMILY_T
+typedef int sa_family_t;
+# define HAVE_SA_FAMILY_T
+#endif /* HAVE_SA_FAMILY_T */
+
+#ifndef HAVE_PID_T
+typedef int pid_t;
+# define HAVE_PID_T
+#endif /* HAVE_PID_T */
+
+#ifndef HAVE_MODE_T
+typedef int mode_t;
+# define HAVE_MODE_T
+#endif /* HAVE_MODE_T */
+
 #if !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE___SS_FAMILY_IN_SS)
 # define ss_family __ss_family
 #endif /* !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE_SA_FAMILY_IN_SS) */
@@ -194,8 +251,16 @@ typedef int ssize_t;
 # endif /* RSH_PATH */
 #endif /* _PATH_RSH */
 
+#ifndef _PATH_NOLOGIN
+# define _PATH_NOLOGIN "/etc/nologin"
+#endif
+
 /* Macros */
 
+#if defined(HAVE_LOGIN_GETCAPBOOL) && defined(HAVE_LOGIN_CAP_H)
+# define HAVE_LOGIN_CAP
+#endif
+
 #ifndef MAX
 # define MAX(a,b) (((a)>(b))?(a):(b))
 # define MIN(a,b) (((a)<(b))?(a):(b))
@@ -231,6 +296,11 @@ typedef int ssize_t;
 # define USE_PAM
 #endif /* defined(HAVE_SECURITY_PAM_APPL_H) && !defined(DISABLE_PAM) */
 
+#ifndef SUN_LEN
+#define SUN_LEN(su) \
+        (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+#endif /* SUN_LEN */
+
 /* Function replacement / compatibility hacks */
 
 /* In older versions of libpam, pam_strerror takes a single argument */
@@ -252,6 +322,10 @@ typedef int ssize_t;
 # define atexit(a) on_exit(a)
 #endif /* !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) */
 
+#if defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP)
+#  define USE_VHANGUP
+#endif /* defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) */
+
 /**
  ** login recorder definitions
  **/
@@ -278,18 +352,33 @@ typedef int ssize_t;
 #endif
 
 /* FIXME: put default paths back in */
-#if !defined(UTMP_FILE) && defined(_PATH_UTMP)
-#  define UTMP_FILE _PATH_UTMP
+#ifndef UTMP_FILE
+#  ifdef _PATH_UTMP
+#    define UTMP_FILE _PATH_UTMP
+#  else
+#    ifdef CONF_UTMP_FILE
+#      define UTMP_FILE CONF_UTMP_FILE
+#    endif
+#  endif
 #endif
-#if !defined(WTMP_FILE) && defined(_PATH_WTMP)
-#  define WTMP_FILE _PATH_WTMP
+#ifndef WTMP_FILE
+#  ifdef _PATH_WTMP
+#    define WTMP_FILE _PATH_WTMP
+#  else
+#    ifdef CONF_WTMP_FILE
+#      define WTMP_FILE CONF_WTMP_FILE
+#    endif
+#  endif
 #endif
 /* pick up the user's location for lastlog if given */
-#if !defined(LASTLOG_FILE) && defined(_PATH_LASTLOG)
-#  define LASTLOG_FILE _PATH_LASTLOG
-#endif
-#if !defined(LASTLOG_FILE) && defined(CONF_LASTLOG_FILE)
-#  define LASTLOG_FILE CONF_LASTLOG_FILE
+#ifndef LASTLOG_FILE
+#  ifdef _PATH_LASTLOG
+#    define LASTLOG_FILE _PATH_LASTLOG
+#  else
+#    ifdef CONF_LASTLOG_FILE
+#      define LASTLOG_FILE CONF_LASTLOG_FILE
+#    endif
+#  endif
 #endif
 
 
@@ -327,5 +416,4 @@ typedef int ssize_t;
 
 /** end of login recorder definitions */
 
-
 #endif /* _DEFINES_H */