1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00

lib: directory_create_or_exist() does not use "uid" parameter

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-07-27 19:18:09 +02:00 committed by Jeremy Allison
parent 2b9c35da12
commit f5efddb9ae
14 changed files with 19 additions and 23 deletions

View File

@ -91,7 +91,7 @@ static char *lpcfg_common_path(TALLOC_CTX* mem_ctx,
}
trim_string(dname,"","/");
ok = directory_create_or_exist(dname, geteuid(), 0755);
ok = directory_create_or_exist(dname, 0755);
if (!ok) {
DEBUG(1, ("Unable to create directory %s for file %s. "
"Error was %s\n", dname, name, strerror(errno)));
@ -231,7 +231,7 @@ char *smbd_tmp_path(TALLOC_CTX *mem_ctx,
return NULL;
}
ok = directory_create_or_exist(dname, geteuid(), 0755);
ok = directory_create_or_exist(dname, 0755);
if (!ok) {
return NULL;
}

View File

@ -649,8 +649,7 @@ _PUBLIC_ bool file_check_permissions(const char *fname,
* @retval true if the directory already existed and has the right permissions
* or was successfully created.
*/
_PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid,
mode_t dir_perms);
_PUBLIC_ bool directory_create_or_exist(const char *dname, mode_t dir_perms);
_PUBLIC_ bool directory_create_or_exist_strict(const char *dname,
uid_t uid,

View File

@ -191,7 +191,6 @@ _PUBLIC_ bool directory_exist(const char *dname)
* or was successfully created.
*/
_PUBLIC_ bool directory_create_or_exist(const char *dname,
uid_t uid,
mode_t dir_perms)
{
int ret;
@ -254,7 +253,7 @@ _PUBLIC_ bool directory_create_or_exist_strict(const char *dname,
bool ok;
int rc;
ok = directory_create_or_exist(dname, uid, dir_perms);
ok = directory_create_or_exist(dname, dir_perms);
if (!ok) {
return false;
}

View File

@ -67,7 +67,7 @@ static char *get_default_corepath(const char *logbase, const char *progname)
goto err_out;
}
if (!directory_create_or_exist(tmp_corepath, uid, mode)) {
if (!directory_create_or_exist(tmp_corepath, mode)) {
DEBUG(0, ("Failed to create %s for user %d with mode 0%o\n",
tmp_corepath, (int)uid, (int)mode));
goto err_out;

View File

@ -373,7 +373,7 @@ ELOG_TDB *elog_open_tdb( const char *logname, bool force_clear, bool read_only )
/* make sure that the eventlog dir exists */
eventlogdir = state_path( "eventlog" );
ok = directory_create_or_exist(eventlogdir, geteuid(), 0755);
ok = directory_create_or_exist(eventlogdir, 0755);
if (!ok) {
return NULL;
}

View File

@ -973,12 +973,12 @@ static bool open_sockets(bool isdaemon, int port)
}
#endif
ok = directory_create_or_exist(lp_lock_directory(), geteuid(), 0755);
ok = directory_create_or_exist(lp_lock_directory(), 0755);
if (!ok) {
exit_daemon("Failed to create directory for lock files, check 'lock directory'", errno);
}
ok = directory_create_or_exist(lp_pid_directory(), geteuid(), 0755);
ok = directory_create_or_exist(lp_pid_directory(), 0755);
if (!ok) {
exit_daemon("Failed to create directory for pid files, check 'pid directory'", errno);
}

View File

@ -95,7 +95,7 @@ static bool print_driver_directories_init(void)
return false;
}
ok = directory_create_or_exist(driver_path, sec_initial_uid(), 0755);
ok = directory_create_or_exist(driver_path, 0755);
if (!ok) {
DEBUG(1, ("Failed to create printer driver directory %s\n",
driver_path));
@ -115,9 +115,7 @@ static bool print_driver_directories_init(void)
return false;
}
ok = directory_create_or_exist(arch_path,
sec_initial_uid(),
0755);
ok = directory_create_or_exist(arch_path, 0755);
if (!ok) {
DEBUG(1, ("Failed to create printer driver "
"architecture directory %s\n",

View File

@ -203,7 +203,7 @@ bool print_backend_init(struct messaging_context *msg_ctx)
return false;
}
ok = directory_create_or_exist(cache_path("printing"), geteuid(), 0755);
ok = directory_create_or_exist(cache_path("printing"), 0755);
if (!ok) {
return false;
}

View File

@ -48,7 +48,7 @@ static char *counters_directory(const char *dbname)
TALLOC_CTX *ctx = talloc_tos();
path = state_path(PERFCOUNTDIR);
if (!directory_create_or_exist(path, geteuid(), 0755)) {
if (!directory_create_or_exist(path, 0755)) {
return NULL;
}

View File

@ -106,7 +106,7 @@ int create_named_pipe_socket(const char *pipe_name)
* lp_ncalrpc_dir()/np should have 0700, we need to
* create lp_ncalrpc_dir() first.
*/
if (!directory_create_or_exist(lp_ncalrpc_dir(), geteuid(), 0755)) {
if (!directory_create_or_exist(lp_ncalrpc_dir(), 0755)) {
DEBUG(0, ("Failed to create pipe directory %s - %s\n",
lp_ncalrpc_dir(), strerror(errno)));
goto out;
@ -773,7 +773,7 @@ int create_dcerpc_ncalrpc_socket(const char *name)
name = "DEFAULT";
}
if (!directory_create_or_exist(lp_ncalrpc_dir(), geteuid(), 0755)) {
if (!directory_create_or_exist(lp_ncalrpc_dir(), 0755)) {
DEBUG(0, ("Failed to create ncalrpc directory %s - %s\n",
lp_ncalrpc_dir(), strerror(errno)));
return -1;

View File

@ -1488,7 +1488,7 @@ extern void build_options(bool screen);
/* This MUST be done before start_epmd() because otherwise
* start_epmd() forks and races against dcesrv_ep_setup() to
* call directory_create_or_exist() */
if (!directory_create_or_exist(lp_ncalrpc_dir(), geteuid(), 0755)) {
if (!directory_create_or_exist(lp_ncalrpc_dir(), 0755)) {
DEBUG(0, ("Failed to create pipe directory %s - %s\n",
lp_ncalrpc_dir(), strerror(errno)));
return -1;

View File

@ -1519,14 +1519,14 @@ int main(int argc, const char **argv)
exit(1);
}
ok = directory_create_or_exist(lp_lock_directory(), geteuid(), 0755);
ok = directory_create_or_exist(lp_lock_directory(), 0755);
if (!ok) {
DEBUG(0, ("Failed to create directory %s for lock files - %s\n",
lp_lock_directory(), strerror(errno)));
exit(1);
}
ok = directory_create_or_exist(lp_pid_directory(), geteuid(), 0755);
ok = directory_create_or_exist(lp_pid_directory(), 0755);
if (!ok) {
DEBUG(0, ("Failed to create directory %s for pid files - %s\n",
lp_pid_directory(), strerror(errno)));

View File

@ -1007,7 +1007,7 @@ static void ldapsrv_task_init(struct task_server *task)
* Make sure the directory for the privileged ldapi socket exists, and
* is of the correct permissions
*/
if (!directory_create_or_exist(priv_dir, geteuid(), 0750)) {
if (!directory_create_or_exist(priv_dir, 0750)) {
task_server_terminate(task, "Cannot create ldap "
"privileged ldapi directory", true);
return;

View File

@ -200,7 +200,7 @@ NTSTATUS tstream_setup_named_pipe(TALLOC_CTX *mem_ctx,
goto fail;
}
if (!directory_create_or_exist(lpcfg_ncalrpc_dir(lp_ctx), geteuid(), 0755)) {
if (!directory_create_or_exist(lpcfg_ncalrpc_dir(lp_ctx), 0755)) {
status = map_nt_error_from_unix_common(errno);
DEBUG(0,(__location__ ": Failed to create ncalrpc pipe directory '%s' - %s\n",
lpcfg_ncalrpc_dir(lp_ctx), nt_errstr(status)));