summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-05-11 11:26:33 +0200
committerVolker Lendecke <vl@samba.org>2008-05-25 11:43:57 +0200
commit50ab871813d8281760e0c70d454cba996e0b67d8 (patch)
tree124efcddf0cbdc86afbc764a0aad75c339d6e5a3 /source3/smbd
parent320fadd8fc600262d26ea417a92d395aeb16ef57 (diff)
downloadsamba-50ab871813d8281760e0c70d454cba996e0b67d8.tar.gz
samba-50ab871813d8281760e0c70d454cba996e0b67d8.tar.bz2
samba-50ab871813d8281760e0c70d454cba996e0b67d8.zip
Remove some references to get_current_username() and current_user_info
(This used to be commit 344d69f95e217d16213eaa6b53141af6ab459708)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/lanman.c8
-rw-r--r--source3/smbd/msdfs.c11
-rw-r--r--source3/smbd/service.c20
3 files changed, 25 insertions, 14 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index fce58d069b..31d4a39842 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -103,7 +103,7 @@ static int CopyExpanded(connection_struct *conn,
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
+ conn->server_info->sanitized_username,
pdb_get_domain(conn->server_info->sam_account),
buf);
if (!buf) {
@@ -154,7 +154,7 @@ static int StrlenExpanded(connection_struct *conn, int snum, char *s)
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
+ conn->server_info->sanitized_username,
pdb_get_domain(conn->server_info->sam_account),
buf);
if (!buf) {
@@ -184,7 +184,7 @@ static char *Expand(connection_struct *conn, int snum, char *s)
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
+ conn->server_info->sanitized_username,
pdb_get_domain(conn->server_info->sam_account),
buf);
}
@@ -3010,7 +3010,7 @@ static bool api_RNetServerGetInfo(connection_struct *conn,uint16 vuid,
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
+ conn->server_info->sanitized_username,
pdb_get_domain(conn->server_info->sam_account),
comment);
if (comment) {
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index e4760ec461..de57d8def2 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -672,6 +672,17 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
return NT_STATUS_OK;
}
+ if (!( strequal(pdp->servicename, lp_servicename(SNUM(conn)))
+ || (strequal(pdp->servicename, HOMES_NAME)
+ && strequal(lp_servicename(SNUM(conn)),
+ conn->server_info->sanitized_username) )) ) {
+
+ /* The given sharename doesn't match this connection. */
+ TALLOC_FREE(pdp);
+
+ return NT_STATUS_OBJECT_PATH_NOT_FOUND;
+ }
+
status = dfs_path_lookup(ctx, conn, path_in, pdp,
search_wcard_flag, NULL, NULL);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 4092928de1..fbce22e975 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -840,8 +840,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
- current_user_info.domain,
+ conn->server_info->sanitized_username,
+ pdb_get_domain(conn->server_info->sam_account),
lp_pathname(snum));
if (!s) {
conn_free(conn);
@@ -962,8 +962,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
- current_user_info.domain,
+ conn->server_info->sanitized_username,
+ pdb_get_domain(conn->server_info->sam_account),
lp_rootpreexec(snum));
DEBUG(5,("cmd=%s\n",cmd));
ret = smbrun(cmd,NULL);
@@ -1001,8 +1001,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
- current_user_info.domain,
+ conn->server_info->sanitized_username,
+ pdb_get_domain(conn->server_info->sam_account),
lp_preexec(snum));
ret = smbrun(cmd,NULL);
TALLOC_FREE(cmd);
@@ -1324,8 +1324,8 @@ void close_cnum(connection_struct *conn, uint16 vuid)
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
- current_user_info.domain,
+ conn->server_info->sanitized_username,
+ pdb_get_domain(conn->server_info->sam_account),
lp_postexec(SNUM(conn)));
smbrun(cmd,NULL);
TALLOC_FREE(cmd);
@@ -1340,8 +1340,8 @@ void close_cnum(connection_struct *conn, uint16 vuid)
conn->server_info->unix_name,
conn->connectpath,
conn->server_info->gid,
- get_current_username(),
- current_user_info.domain,
+ conn->server_info->sanitized_username,
+ pdb_get_domain(conn->server_info->sam_account),
lp_rootpostexec(SNUM(conn)));
smbrun(cmd,NULL);
TALLOC_FREE(cmd);