Prva inačica za buster

[sysadmin-cn.git] / sysadmin.h

diff --git a/sysadmin.h b/sysadmin.h
index b79de61..1190d21 100644 (file)
--- a/sysadmin.h
+++ b/sysadmin.h
@@ -24,41 +24,41 @@
 /* HM's must have / at the end !!! */
 
 #if defined(__linux__)
-  #define HM "/home/"
-  #if defined(__i386__)
-    #include "quota.h"  /* From quota-3.09, works only for new quota! */
-    #include "quotaio.h"
-    #include "dqblk_v2.h"
-    #include <mntent.h>
-  #elif defined(__sparc__)
-    #include <sys/quota.h>
-    #include <mntent.h>
-  #else
-  #error Unknown architecture!
-  #endif
+#define HM "/home/"
+#if defined(__i386__) || defined(__x86_64__)
+#include "quota.h"  /* From quota-3.09, works only for new quota! */
+#include "quotaio.h"
+#include "dqblk_v2.h"
+#include <mntent.h>
+#elif defined(__sparc__)
+#include <sys/quota.h>
+#include <mntent.h>
+#else
+#error Unknown architecture!
+#endif
 #elif defined(__SVR4)
-  #define HM "/home/"
-  #include <sys/fs/ufs_quota.h>
+#define HM "/home/"
+#include <sys/fs/ufs_quota.h>
 #elif defined(__osf__)
-  #if defined(DU4)
-    #define HM "/home/"
-    #include <sys/security.h>
-    #include <prot.h>
-    #include <ufs/quota.h>
-    int quotactl(char *, int, int, char *);
-  #else
-    #define HM "/usr/users/"
-    #include <ufs/quota.h>
-    int quotactl(char *, int, int, char *);
-  #endif
+#if defined(DU4)
+#define HM "/home/"
+#include <sys/security.h>
+#include <prot.h>
+#include <ufs/quota.h>
+int quotactl(char *, int, int, char *);
+#else
+#define HM "/usr/users/"
+#include <ufs/quota.h>
+int quotactl(char *, int, int, char *);
+#endif
 #elif defined(ultrix)
-  #define HM "/usr/users/"
-  #include <sys/param.h>
-  #include <sys/quota.h>
-  int quota(int, int, int, caddr_t);
-  extern int setreuid(uid_t, uid_t);
-  extern int seteuid(uid_t);
-  extern int putenv(char *);
+#define HM "/usr/users/"
+#include <sys/param.h>
+#include <sys/quota.h>
+int quota(int, int, int, caddr_t);
+extern int setreuid(uid_t, uid_t);
+extern int seteuid(uid_t);
+extern int putenv(char *);
 #endif
 
 #define ALL 0                  /* forbidden + srce + admin */
@@ -85,26 +85,28 @@
 #define CONF_NOCONSOLE "no_console_check" /* Config: don't check for console */
 
 #if defined (__linux__) || defined(__SVR4)
-  #define LOGFILE "/var/log/sysadmin.log" /* logfile */
-  #define ACLFILE "/etc/sysadmin/users"   /* acl file */
-  #define OPTFILE "/etc/sysadmin/config"  /* config */
-  #if defined (__linux__)
-    #define MANFILE "/usr/share/sysadmin/sysadm.man" /* online manual */
-    #define PARSE_USERADD_DEFAULTS 1
-  #else /* __SVR4 */
-    #define MANFILE "/usr/local/share/sysadmin/sysadm.man" /* online manual */
-  #endif
+#define LOGFILE "/var/log/sysadmin.log" /* logfile */
+#define ACLFILE "/etc/sysadmin/users"   /* acl file */
+#define OPTFILE "/etc/sysadmin/config"  /* config */
+#define GROUPFILE "/etc/group" /* group file */
+#define GROUPTMPFILE "/tmp/group" /* tmp group file */
+#if defined (__linux__)
+#define MANFILE "/usr/share/sysadmin/sysadm.man" /* online manual */
+#define PARSE_USERADD_DEFAULTS 1
+#else /* __SVR4 */
+#define MANFILE "/usr/local/share/sysadmin/sysadm.man" /* online manual */
+#endif
 #else
-  #define LOGFILE "/var/adm/adminlog" /* logfile */
-  #define ACLFILE "/etc/adminusers"   /* acl file */
-  #define OPTFILE "/etc/adminconfig"  /* config */
-  #define MANFILE "/etc/sysadm.man"   /* online manual */
+#define LOGFILE "/var/adm/adminlog" /* logfile */
+#define ACLFILE "/etc/adminusers"   /* acl file */
+#define OPTFILE "/etc/adminconfig"  /* config */
+#define MANFILE "/etc/sysadm.man"   /* online manual */
 #endif
 
 #if defined(__linux__)
-  #define DEFAULTSHELL "/bin/bash"
+#define DEFAULTSHELL "/bin/bash"
 #else
-  #define DEFAULTSHELL "/bin/csh"
+#define DEFAULTSHELL "/bin/csh"
 #endif
 
 /* function prototypes */