summaryrefslogtreecommitdiff
path: root/source3/smbd/connection.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-16 19:10:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:23 -0500
commit74a07edb505c9f20a93c00da06cb5c997b6b3c8a (patch)
tree443db34b14a6edd4931e18b2fd746ace0acf4ee8 /source3/smbd/connection.c
parent4341be45935487a50ff7cde28387f47fe74b13ac (diff)
downloadsamba-74a07edb505c9f20a93c00da06cb5c997b6b3c8a.tar.gz
samba-74a07edb505c9f20a93c00da06cb5c997b6b3c8a.tar.bz2
samba-74a07edb505c9f20a93c00da06cb5c997b6b3c8a.zip
r22266: Fix bug #4512 - we were returning a volume label greater than
32 unicode chars. Windows XP doesn't like that :-). Jeremy (This used to be commit e59b5276b56d6963ddd0598bbd1b15426d2d13e8)
Diffstat (limited to 'source3/smbd/connection.c')
-rw-r--r--source3/smbd/connection.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 7e53a29b04..5c31a5460b 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -108,13 +108,13 @@ static int count_fn( TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *u
if (cs->Clear && !process_exists(crec.pid) && (errno == ESRCH)) {
DEBUG(2,("pid %s doesn't exist - deleting connections %d [%s]\n",
- procid_str_static(&crec.pid), crec.cnum, crec.name));
+ procid_str_static(&crec.pid), crec.cnum, crec.servicename));
if (tdb_delete(the_tdb, kbuf) != 0)
DEBUG(0,("count_fn: tdb_delete failed with error %s\n", tdb_errorstr(tdb) ));
return 0;
}
- if (strequal(crec.name, cs->name))
+ if (strequal(crec.servicename, cs->name))
cs->curr_connections++;
return 0;
@@ -191,8 +191,8 @@ BOOL claim_connection(connection_struct *conn, const char *name,int max_connecti
if (conn) {
crec.uid = conn->uid;
crec.gid = conn->gid;
- safe_strcpy(crec.name,
- lp_servicename(SNUM(conn)),sizeof(crec.name)-1);
+ safe_strcpy(crec.servicename,
+ lp_servicename(SNUM(conn)),sizeof(crec.servicename)-1);
}
crec.start = time(NULL);
crec.bcast_msg_flags = msg_flags;