"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/util/util_paths.c" between
samba-4.12.3.tar.gz and samba-4.12.5.tar.gz

About: Samba is the standard Windows interoperability suite of programs for Linux and Unix providing secure, stable and fast file and print services for all clients using the SMB/CIFS protocol. 4.12 series.

util_paths.c  (samba-4.12.3):util_paths.c  (samba-4.12.5)
/* /*
Unix SMB/CIFS implementation. Unix SMB/CIFS implementation.
Samba utility functions Samba utility functions
Copyright (C) Andrew Tridgell 1992-1998 Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) Jeremy Allison 2001-2007 Copyright (C) Jeremy Allison 2001-2007
Copyright (C) Simo Sorce 2001 Copyright (C) Simo Sorce 2001
Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003 Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
Copyright (C) James Peach 2006 Copyright (C) James Peach 2006
Copyright (c) 2020 Andreas Schneider <asn@samba.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "includes.h" #include "includes.h"
#include "dynconfig/dynconfig.h" #include "dynconfig/dynconfig.h"
#include "lib/util/util_paths.h" #include "lib/util/util_paths.h"
#include "system/passwd.h"
/** /**
* @brief Returns an absolute path to a file in the Samba modules directory. * @brief Returns an absolute path to a file in the Samba modules directory.
* *
* @param name File to find, relative to MODULESDIR. * @param name File to find, relative to MODULESDIR.
* *
* @retval Pointer to a string containing the full path. * @retval Pointer to a string containing the full path.
**/ **/
char *modules_path(TALLOC_CTX *mem_ctx, const char *name) char *modules_path(TALLOC_CTX *mem_ctx, const char *name)
skipping to change at line 64 skipping to change at line 66
/** /**
* @brief Returns the platform specific shared library extension. * @brief Returns the platform specific shared library extension.
* *
* @retval Pointer to a const char * containing the extension. * @retval Pointer to a const char * containing the extension.
**/ **/
const char *shlib_ext(void) const char *shlib_ext(void)
{ {
return get_dyn_SHLIBEXT(); return get_dyn_SHLIBEXT();
} }
static char *get_user_home_dir(TALLOC_CTX *mem_ctx)
{
struct passwd pwd = {0};
struct passwd *pwdbuf = NULL;
char buf[NSS_BUFLEN_PASSWD] = {0};
int rc;
rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
if (rc != 0 || pwdbuf == NULL ) {
int len_written;
const char *szPath = getenv("HOME");
if (szPath == NULL) {
return NULL;
}
len_written = snprintf(buf, sizeof(buf), "%s", szPath);
if (len_written >= sizeof(buf) || len_written < 0) {
/* Output was truncated or an error. */
return NULL;
}
return talloc_strdup(mem_ctx, buf);
}
return talloc_strdup(mem_ctx, pwd.pw_dir);
}
char *path_expand_tilde(TALLOC_CTX *mem_ctx, const char *d)
{
char *h = NULL, *r = NULL;
const char *p = NULL;
struct stat sb = {0};
int rc;
if (d[0] != '~') {
return talloc_strdup(mem_ctx, d);
}
d++;
/* handle ~user/path */
p = strchr(d, '/');
if (p != NULL && p > d) {
struct passwd *pw;
size_t s = p - d;
char u[128];
if (s >= sizeof(u)) {
return NULL;
}
memcpy(u, d, s);
u[s] = '\0';
pw = getpwnam(u);
if (pw == NULL) {
return NULL;
}
h = talloc_strdup(mem_ctx, pw->pw_dir);
} else {
p = d;
h = get_user_home_dir(mem_ctx);
}
if (h == NULL) {
return NULL;
}
rc = stat(h, &sb);
if (rc != 0) {
TALLOC_FREE(h);
return NULL;
}
r = talloc_asprintf(mem_ctx, "%s%s", h, p);
TALLOC_FREE(h);
return r;
}
 End of changes. 3 change blocks. 
0 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)