- arranged setresuid/setresgid etc detection. this is horrible, because

  setresgid/setegid/setregid etc do not work without setresuid etc being
  called first.  therefore, i had to add a 16-way matrix to set USE_SETRESUID
  _and_ USE_SETRESGID etc etc in order to detect the correct USE_SET??GID
  etc.

  why?  because linux/alpha has setresuid but not setresgid!  how many other
  systems have this silly kind of mis-match?

- cut across andrew's setuid etc mods, removing direct calls to seteuid etc.

also:

From Elrond@Wunder-Nett.org Wed Mar 22 06:33:51 2000
Date: Tue, 21 Mar 2000 16:53:32 +0100
From: Elrond <Elrond@Wunder-Nett.org>
To: Luke Kenneth Casson Leighton <lkcl@samba.org>
Subject: more merge, sharegetinfo and things


- as Greg noticed, libubiqx isn't currently needed by
  rpcclient, so removed it from the linkline.
- merged some more fun from HEAD for configure.in /
  acconfig.h
- someone broke it and set the lockdir to $prefix/var
  instead of $prefix/var/locks in configure.in... And I was
  wondering, why my stop-start-script couldn't stop samba
  any more
- lib/debug.c-merge, this also should fix some prob on
  irix, I was having. (please don't indent this one)
- sids: Creator-Owner is S-1-3-0 not S-1-3, SYSTEM is
  S-1-5-18, not -17.
- lsarpcd: I changed the behaviour back a bit to return
  dom\dom for domains and well-known-sids. It's not the
  "correct" behaviour, but it makes "add user" in the
  "acl-editor" nicer.
- params/loadparm.c: Merged some things from HEAD and
  reordered a bit to reflect HEAD more. Of course the new
  parameters are completely unused.
- Got share_get_info at level 502 answer working, and one
  can now even see the "max connections" from nt.


    Elrond

1 files changed, 26 insertions, 5 deletions

diff --git a/source/acconfig.h b/source/acconfig.h
index 1ba9dc62486..4bdbba297dc 100644
--- a/source/acconfig.h
+++ b/source/acconfig.h
@@ -1,3 +1,4 @@
+#undef HAVE_VOLATILE
 #undef HAVE_BROKEN_READDIR
 #undef HAVE_ERRNO_DECL
 #undef HAVE_LONGLONG
@@ -5,6 +6,7 @@
 #undef HAVE_REMSH
 #undef HAVE_UNSIGNED_CHAR
 #undef HAVE_UTIMBUF
+#undef HAVE_SIG_ATOMIC_T_TYPE
 #undef ssize_t
 #undef ino_t
 #undef ssize_t
@@ -23,19 +25,22 @@
 #undef AIX
 #undef BSD
 #undef IRIX
+#undef IRIX6
 #undef HPUX
 #undef QNX
 #undef SCO
 #undef OSF1
 #undef NEXT2
+#undef RELIANTUNIX
 #undef HAVE_SHARED_MMAP
+#undef HAVE_MMAP
 #undef HAVE_SYSV_IPC
 #undef HAVE_FCNTL_LOCK
 #undef HAVE_FTRUNCATE_EXTEND
+#undef FTRUNCATE_NEEDS_ROOT
 #undef HAVE_TRAPDOOR_UID
 #undef HAVE_ROOT
 #undef HAVE_UNION_SEMUN
-#undef HAVE_NETMASK_IFCONF
 #undef HAVE_GETTIMEOFDAY_TZ
 #undef HAVE_SOCK_SIN_LEN
 #undef STAT_READ_FILSYS
@@ -46,8 +51,13 @@
 #undef STAT_STATFS4
 #undef STAT_STATVFS
 #undef STAT_STATVFS64
+#undef HAVE_PAM_AUTHENTICATE
+#undef HAVE_NETMASK_IFCONF
 #undef HAVE_NETMASK_IFREQ
 #undef HAVE_NETMASK_AIX
+#undef HAVE_IFACE_AIX
+#undef HAVE_IFACE_IFCONF
+#undef HAVE_IFACE_IFREQ
 #undef HAVE_CRYPT
 #undef HAVE_PUTPRPWNAM
 #undef HAVE_SET_AUTH_PARAMETERS
@@ -58,19 +68,23 @@
 #undef WITH_LDAP
 #undef WITH_TDBSURS
 #undef WITH_NISPLUS
+#undef WITH_PAM
 #undef WITH_NISPLUS_HOME
 #undef WITH_AUTOMOUNT
 #undef WITH_SMBMOUNT
-#undef HAVE_PAM_AUTHENTICATE
 #undef HAVE_BROKEN_GETGROUPS
 #undef REPLACE_GETPASS
 #undef REPLACE_INET_NTOA
 #undef HAVE_FILE_MACRO
 #undef HAVE_FUNCTION_MACRO
 #undef HAVE_SETRESUID_DECL
-#undef HAVE_CRYPT_DECL
 #undef HAVE_SETRESUID
+#undef HAVE_SETRESGID_DECL
+#undef HAVE_SETRESGID
+#undef HAVE_CRYPT_DECL
 #undef WITH_NETATALK
+#undef WITH_UTMP
+#undef MS_DFS
 #undef HAVE_INO64_T
 #undef HAVE_STRUCT_FLOCK64
 #undef SIZEOF_INO_T
@@ -85,11 +99,15 @@
 #undef HAVE_INT32_FROM_RPC_RPC_H
 #undef HAVE_UINT32_FROM_RPC_RPC_H
 #undef KRB4_AUTH
+#undef KRB5_AUTH
 #undef SEEKDIR_RETURNS_VOID
 #undef HAVE_DIRENT_D_OFF
 #undef HAVE_GETSPNAM
 #undef HAVE_BIGCRYPT
 #undef HAVE_GETPRPWNAM
+#undef HAVE_SHADOW_H
+#undef HAVE_MEMSET
+#undef USE_BOTH_CRYPT_CALLS
 
 #undef WITH_LIBMSRPC
 #undef WITH_LIBNMB
@@ -99,13 +117,16 @@
 #undef WITH_LIBSMBPW
 #undef WITH_LIBUBIQX
 
+#undef USE_SETEGID
+#undef USE_SETRESGID
+#undef USE_SETREGID
+#undef USE_SETGIDX
 #undef USE_SETEUID
 #undef USE_SETRESUID
 #undef USE_SETREUID
 #undef USE_SETUIDX
+#undef SYSCONF_SC_NGROUPS_MAX
 #undef USE_KRB4_DEFINE_WORK_AROUND
 #undef USE_RENEWABLE_AFS_TICKET
 
 #undef WITH_NT5LDAP
-
-#undef HAVE_VOLATILE