From 33242471e5ad974bf96d2340c9aa8d56941795e7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 4 Jul 2010 18:12:24 +0200 Subject: s3: Remove NULL checks from claim_connection() Nowadays this is only called from make_connection_snum() where we always provide a connection_struct. --- source3/smbd/connection.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'source3/smbd/connection.c') diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c index e2d15f1ccd..1b41931279 100644 --- a/source3/smbd/connection.c +++ b/source3/smbd/connection.c @@ -139,13 +139,11 @@ bool claim_connection(connection_struct *conn, const char *name) ZERO_STRUCT(crec); crec.magic = 0x280267; crec.pid = procid_self(); - crec.cnum = conn?conn->cnum:-1; - if (conn) { - crec.uid = conn->server_info->utok.uid; - crec.gid = conn->server_info->utok.gid; - strlcpy(crec.servicename, lp_servicename(SNUM(conn)), - sizeof(crec.servicename)); - } + crec.cnum = conn->cnum; + crec.uid = conn->server_info->utok.uid; + crec.gid = conn->server_info->utok.gid; + strlcpy(crec.servicename, lp_servicename(SNUM(conn)), + sizeof(crec.servicename)); crec.start = time(NULL); strlcpy(crec.machine,get_remote_machine_name(),sizeof(crec.machine)); -- cgit