Merge branch 'master' of /home/jelmer/samba3

Conflicts:
	lib/replace/README
	lib/replace/libreplace.m4
	lib/replace/replace.c
	source3/include/proto.h
	source3/lib/system.c

diff --cc replace/README
index 108534d29b7b3daa7bdcfb68827957cd4566b227,c1cb2d0270d04629ebe7be37eaf252250ae93f22..26383bc89a2ee9ad4604c2e70edafc1cfa05bc2e
--- 1/replace/README
--- 2/replace/README
+++ b/replace/README
@@@ -64,7 -66,10 +66,11 @@@ getifaddr
  freeifaddrs
  utime
  utimes
 +dup2
+ link
+ readlink
+ symlink
+ realpath
  
  Types:
  bool

diff --cc replace/libreplace.m4
index 6c72cf8a2c68f71c64e6ad5beca36ee163c511fe,c67fa66f5c202b2575c3996e1198ee77c48fe0fb..30d7017d0fcb65acd2df5a2ea8fa3eae19f75bb9
--- 1/replace/libreplace.m4
--- 2/replace/libreplace.m4
+++ b/replace/libreplace.m4
@@@ -107,8 -107,8 +107,8 @@@ AC_CHECK_HEADERS(stropts.h
  AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
  AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
  AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
 -AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
 +AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp dup2)
- AC_CHECK_FUNCS(isatty)
+ AC_CHECK_FUNCS(isatty chown lchown link readlink symlink realpath)
  AC_HAVE_DECL(setresuid, [#include <unistd.h>])
  AC_HAVE_DECL(setresgid, [#include <unistd.h>])
  AC_HAVE_DECL(errno, [#include <errno.h>])

diff --cc replace/replace.c
index 4aa84b886d1ccd0c335b3b3666ff8e006543c00a,0683f556eb8f5fafd48f5bfbfeff0a062026187c..78c688d50c72ef8d621e5b0a1bc36f3f0119fd1e
--- 1/replace/replace.c
--- 2/replace/replace.c
+++ b/replace/replace.c
@@@ -615,11 -616,54 +616,62 @@@ int rep_utimes(const char *filename, co
  }
  #endif
  
 +#ifndef HAVE_DUP2
 +int rep_dup2(int oldfd, int newfd) 
 +{
 +      errno = ENOSYS;
 +      return -1;
 +}
 +#endif
 +
+ #ifndef HAVE_CHOWN
+ /**
+ chown isn't used much but OS/2 doesn't have it
+ **/
+ int rep_chown(const char *fname, uid_t uid, gid_t gid)
+ {
+       errno = ENOSYS;
+       return -1;
+ }
+ #endif
+ 
+ #ifndef HAVE_LINK
+ int rep_link(const char *oldpath, const char *newpath)
+ {
+       errno = ENOSYS;
+       return -1;
+ }
+ #endif
+ 
+ #ifndef HAVE_READLINK
+ int rep_readlink(const char *path, char *buf, size_t bufsiz)
+ {
+       errno = ENOSYS;
+       return -1;
+ }
+ #endif
+ 
+ #ifndef HAVE_SYMLINK
+ int rep_symlink(const char *oldpath, const char *newpath)
+ {
+       errno = ENOSYS;
+       return -1;
+ }
+ #endif
+ 
+ #ifndef HAVE_LCHOWN
+ int rep_lchown(const char *fname,uid_t uid,gid_t gid)
+ {
+       errno = ENOSYS;
+       return -1;
+ }
+ #endif
+ 
+ #ifndef HAVE_REALPATH
+ char *rep_realpath(const char *path, char *resolved_path)
+ {
+       /* As realpath is not a system call we can't return ENOSYS. */
+       errno = EINVAL;
+       return NULL;
+ }
+ #endif

diff --cc replace/replace.h
Simple merge