s3: Remove NULL checks from claim_connection()
authorVolker Lendecke <vl@samba.org>
Sun, 4 Jul 2010 16:12:24 +0000 (18:12 +0200)
committerVolker Lendecke <vl@samba.org>
Mon, 5 Jul 2010 09:06:25 +0000 (11:06 +0200)
Nowadays this is only called from make_connection_snum() where we always
provide a connection_struct.

source3/smbd/connection.c

index e2d15f1ccde5e0ed36d89ee633858cd7e3d70be7..1b41931279daed989c40c6f89b5710d68aecfbad 100644 (file)
@@ -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));