sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

Move sys_lchown() to libreplace.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-11-01 03:39:20 +01:00
parent e8cda43e17
commit 38d67363ac
8 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/replace/README
View File

@ -47,6 +47,7 @@ mkstemp (a secure one!)
pread pread
pwrite pwrite
chown chown
lchown
getpass getpass
readline (the library) readline (the library)
inet_ntoa inet_ntoa

2
lib/replace/libreplace.m4
View File

@ -108,7 +108,7 @@ AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename) AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup) 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)
AC_CHECK_FUNCS(isatty chown link readlink symlink) AC_CHECK_FUNCS(isatty chown lchown link readlink symlink)
AC_HAVE_DECL(setresuid, [#include <unistd.h>]) AC_HAVE_DECL(setresuid, [#include <unistd.h>])
AC_HAVE_DECL(setresgid, [#include <unistd.h>]) AC_HAVE_DECL(setresgid, [#include <unistd.h>])
AC_HAVE_DECL(errno, [#include <errno.h>]) AC_HAVE_DECL(errno, [#include <errno.h>])

8
lib/replace/replace.c
View File

@ -650,3 +650,11 @@ int rep_symlink(const char *oldpath, const char *newpath)
return -1; return -1;
} }
#endif #endif
#ifndef HAVE_LCHOWN
int rep_lchown(const char *fname,uid_t uid,gid_t gid)
{
errno = ENOSYS;
return -1;
}
#endif

4
lib/replace/replace.h
View File

@ -235,6 +235,10 @@ int rep_readlink(const char *path, char *buf, size_t bufsize);
int rep_symlink(const char *oldpath, const char *newpath); int rep_symlink(const char *oldpath, const char *newpath);
#endif #endif
#ifndef HAVE_LCHOWN
#define lchown rep_lchown
int rep_lchown(const char *fname,uid_t uid,gid_t gid);
#endif
#ifndef HAVE_SETLINEBUF #ifndef HAVE_SETLINEBUF
#define setlinebuf rep_setlinebuf #define setlinebuf rep_setlinebuf

1
source3/include/proto.h
View File

@ -1003,7 +1003,6 @@ int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
char *sys_realpath(const char *path, char *resolved_path); char *sys_realpath(const char *path, char *resolved_path);
int sys_waitpid(pid_t pid,int *status,int options); int sys_waitpid(pid_t pid,int *status,int options);
char *sys_getwd(char *s); char *sys_getwd(char *s);
int sys_lchown(const char *fname,uid_t uid,gid_t gid);
int sys_chroot(const char *dname); int sys_chroot(const char *dname);
void set_effective_capability(enum smbd_capability capability); void set_effective_capability(enum smbd_capability capability);
void drop_effective_capability(enum smbd_capability capability); void drop_effective_capability(enum smbd_capability capability);

19
source3/lib/system.c
View File

@ -580,25 +580,6 @@ char *sys_getwd(char *s)
return wd; return wd;
} }
/*******************************************************************
Wrapper for lchown.
********************************************************************/
int sys_lchown(const char *fname,uid_t uid,gid_t gid)
{
#ifndef HAVE_LCHOWN
static int done;
if (!done) {
DEBUG(1,("WARNING: no lchown!\n"));
done=1;
}
errno = ENOSYS;
return -1;
#else
return(lchown(fname,uid,gid));
#endif
}
/******************************************************************* /*******************************************************************
os/2 also doesn't have chroot os/2 also doesn't have chroot
********************************************************************/ ********************************************************************/

2
source3/modules/vfs_default.c
View File

@ -621,7 +621,7 @@ static int vfswrap_lchown(vfs_handle_struct *handle, const char *path, uid_t uid
int result; int result;
START_PROFILE(syscall_lchown); START_PROFILE(syscall_lchown);
result = sys_lchown(path, uid, gid); result = lchown(path, uid, gid);
END_PROFILE(syscall_lchown); END_PROFILE(syscall_lchown);
return result; return result;
} }

2
source3/modules/vfs_netatalk.c
View File

@ -399,7 +399,7 @@ static int atalk_lchown(struct vfs_handle_struct *handle, const char *path, uid_
goto exit_lchown; goto exit_lchown;
} }
sys_lchown(adbl_path, uid, gid); lchown(adbl_path, uid, gid);
exit_lchown: exit_lchown:
talloc_destroy(ctx); talloc_destroy(ctx);