Changeset 916 for trunk/server/source3/rpc_server/netlogon

Timestamp:

Jun 6, 2016, 8:53:52 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to version 3.6.25, fix some more crlf issues

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpc_server/netlogon/srv_netlog_nt.c (modified) (3 diffs)

trunk/server/source3/rpc_server/netlogon/srv_netlog_nt.c

@@ -1071 +1071 @@
         bool schannel_global_required = (lp_server_schannel() == true) ? true:false;
 
+        if (creds_out != NULL) {
+                *creds_out = NULL;
+        }
+
         if (schannel_global_required) {
                 status = schannel_check_required(&p->auth,
@@ -1206 +1210 @@
         NTSTATUS status = NT_STATUS_OK;
         int i;
-        struct netlogon_creds_CredentialState *creds;
+        struct netlogon_creds_CredentialState *creds = NULL;
 
         DEBUG(5,("_netr_ServerPasswordSet: %d\n", __LINE__));
@@ -1219 +1223 @@
 
         if (!NT_STATUS_IS_OK(status)) {
+                const char *computer_name = "<unknown>";
+
+                if (creds != NULL && creds->computer_name != NULL) {
+                        computer_name = creds->computer_name;
+                }
                 DEBUG(2,("_netr_ServerPasswordSet: netlogon_creds_server_step failed. Rejecting auth "
                         "request from client %s machine account %s\n",
-                        r->in.computer_name, creds->computer_name));
+                        r->in.computer_name, computer_name));
                 TALLOC_FREE(creds);
                 return status;