sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Samba janitor: adding mbp's umask patch :-).

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 8712bd1f8e
commit d4d8d27bf1
1 changed files with 69 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
source/lib/util_sock.c
View File

@ -888,103 +888,93 @@ char *get_socket_addr(int fd)
/******************************************************************* /*******************************************************************
Create protected unix domain socket. Create protected unix domain socket.
some unixen cannot set permissions on a ux-dom-sock, so we Some unixes cannot set permissions on a ux-dom-sock, so we
have to make sure that the directory contains the protection have to make sure that the directory contains the protection
permissions, instead. permissions instead.
******************************************************************/ ******************************************************************/
int create_pipe_sock(const char *socket_dir, int create_pipe_sock(const char *socket_dir,
const char *socket_name, const char *socket_name,
mode_t dir_perms) mode_t dir_perms)
{ {
#ifdef HAVE_UNIXSOCKET #ifdef HAVE_UNIXSOCKET
struct sockaddr_un sunaddr; struct sockaddr_un sunaddr;
struct stat st; struct stat st;
int sock; int sock;
mode_t old_umask; mode_t old_umask;
pstring path; pstring path;
/* Create the socket directory or reuse the existing one */ old_umask = umask(0);
if (lstat(socket_dir, &st) == -1) { /* Create the socket directory or reuse the existing one */
if (errno == ENOENT) {
/* Create directory */
if (mkdir(socket_dir, dir_perms) == -1) {
DEBUG(0, ("error creating socket directory "
"%s: %s\n", socket_dir,
strerror(errno)));
return -1;
}
} else {
DEBUG(0, ("lstat failed on socket directory %s: %s\n",
socket_dir, strerror(errno)));
return -1;
}
} else {
/* Check ownership and permission on existing directory */
if (!S_ISDIR(st.st_mode)) {
DEBUG(0, ("socket directory %s isn't a directory\n",
socket_dir));
return -1;
}
if ((st.st_uid != sec_initial_uid()) ||
((st.st_mode & 0777) != dir_perms)) {
DEBUG(0, ("invalid permissions on socket directory "
"%s\n", socket_dir));
return -1;
}
}
/* Create the socket file */ if (lstat(socket_dir, &st) == -1) {
if (errno == ENOENT) {
/* Create directory */
if (mkdir(socket_dir, dir_perms) == -1) {
DEBUG(0, ("error creating socket directory "
"%s: %s\n", socket_dir,
strerror(errno)));
goto out_umask;
}
} else {
DEBUG(0, ("lstat failed on socket directory %s: %s\n",
socket_dir, strerror(errno)));
goto out_umask;
}
} else {
/* Check ownership and permission on existing directory */
if (!S_ISDIR(st.st_mode)) {
DEBUG(0, ("socket directory %s isn't a directory\n",
socket_dir));
goto out_umask;
}
if ((st.st_uid != sec_initial_uid()) ||
((st.st_mode & 0777) != dir_perms)) {
DEBUG(0, ("invalid permissions on socket directory "
"%s\n", socket_dir));
goto out_umask;
}
}
old_umask = umask(0); /* Create the socket file */
sock = socket(AF_UNIX, SOCK_STREAM, 0); sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock == -1) { if (sock == -1) {
perror("socket"); perror("socket");
umask(old_umask); goto out_umask;
return -1; }
}
snprintf(path, sizeof(path), "%s/%s", socket_dir, socket_name); snprintf(path, sizeof(path), "%s/%s", socket_dir, socket_name);
unlink(path); unlink(path);
memset(&sunaddr, 0, sizeof(sunaddr)); memset(&sunaddr, 0, sizeof(sunaddr));
sunaddr.sun_family = AF_UNIX; sunaddr.sun_family = AF_UNIX;
safe_strcpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path)-1); safe_strcpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path)-1);
if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1) { if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1) {
DEBUG(0, ("bind failed on pipe socket %s: %s\n", DEBUG(0, ("bind failed on pipe socket %s: %s\n", path,
path, strerror(errno)));
strerror(errno))); goto out_close;
close(sock); }
umask(old_umask);
return -1;
}
if (listen(sock, 5) == -1) { if (listen(sock, 5) == -1) {
DEBUG(0, ("listen failed on pipe socket %s: %s\n", DEBUG(0, ("listen failed on pipe socket %s: %s\n", path,
path, strerror(errno)));
strerror(errno))); goto out_close;
close(sock); }
umask(old_umask);
return -1;
}
umask(old_umask); umask(old_umask);
return sock;
/* Success! */
out_close:
return sock; close(sock);
out_umask:
umask(old_umask);
return -1;
#else #else
DEBUG(0, ("create_pipe_sock: No Unix sockets on this system\n")); DEBUG(0, ("create_pipe_sock: No Unix sockets on this system\n"));
return -1; return -1;