s3:rpc_server: Fix possible NULL dereference

Found by covscan.

Pair-Programmed-With: Andreas Schneider <asn@samba.org>

Signed-off-by: Pavel Filipenský <pfilipen@redhat.com>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index f3c56a6bef157b079b96c4b7080a3b3cebe6634d..5906464a9f310b5e4f2697b654fc85da0ab26d79 100644 (file)
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -1512,14 +1512,9 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
        unbecome_root();
 
        if (!NT_STATUS_IS_OK(status)) {
-               const char *computer_name = "<unknown>";
-
-               if (creds && creds->computer_name) {
-                       computer_name = creds->computer_name;
-               }
-               DEBUG(2,("_netr_ServerPasswordSet2: netlogon_creds_server_step "
-                       "failed. Rejecting auth request from client %s machine account %s\n",
-                       r->in.computer_name, computer_name));
+               DBG_NOTICE("netlogon_creds_server_step failed. "
+                          "Rejecting auth request from client %s\n",
+                          r->in.computer_name);
                TALLOC_FREE(creds);
                return status;
        }
@@ -1527,7 +1522,8 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
        DBG_NOTICE("Server Password Set2 by remote "
                   "machine:[%s] on account [%s]\n",
                   r->in.computer_name,
-                  creds->computer_name);
+                  creds->computer_name != NULL ?
+                       creds->computer_name : "<unknown>");
 
        memcpy(password_buf.data, r->in.new_password->data, 512);
        SIVAL(password_buf.data, 512, r->in.new_password->length);