summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/password.c2
-rw-r--r--source3/smbd/reply.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index f9aa10eced..95f03ab204 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -167,7 +167,7 @@ int setup_groups(char *user, char *domain,
gid_t grp = 0;
gid_t *groups = NULL;
- if (-1 == smb_initgroups(user,domain,gid))
+ if (-1 == initgroups(user,gid))
{
DEBUG(0,("Unable to initgroups. Error was %s\n", strerror(errno) ));
if (getuid() == 0)
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5c80a61511..b08606452f 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -857,7 +857,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int
that */
if (!getpwnam(user)) {
pstring user2;
- slprintf(user2,sizeof(user2),"%s/%s", domain, user);
+ slprintf(user2,sizeof(user2),"%s%s%s", domain, lp_winbind_separator(), user);
if (getpwnam(user2)) {
DEBUG(3,("Using unix username %s\n", user2));
pstrcpy(user, user2);