Changeset 988 for vendor/current/source3/libsmb/clidgram.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/clidgram.c (modified) (8 diffs)

vendor/current/source3/libsmb/clidgram.c

@@ -26 +26 @@
 #include "libsmb/nmblib.h"
 #include "messages.h"
+#include "librpc/gen_ndr/samr.h"
+#include "../lib/util/pidfile.h"
 
 /*
@@ -32 +34 @@
 
 static bool cli_prep_mailslot(bool unique, const char *mailslot,
-                       uint16 priority,
+                       uint16_t priority,
                        char *buf, int len,
                        const char *srcname, int src_type,
@@ -141 +143 @@
         }
 
-        my_acct_name = talloc_asprintf(talloc_tos(), "%s$", global_myname());
+        my_acct_name = talloc_asprintf(talloc_tos(), "%s$", lp_netbios_name());
         if (my_acct_name == NULL) {
                 goto fail;
@@ -150 +152 @@
 
         s->request_count        = 0;
-        s->computer_name        = global_myname();
+        s->computer_name        = lp_netbios_name();
         s->user_name            = my_acct_name;
         s->mailslot_name        = my_mailslot;
@@ -171 +173 @@
         ret = cli_prep_mailslot(false, NBT_MAILSLOT_NTLOGON, 0,
                                 (char *)blob.data, blob.length,
-                                global_myname(), 0, domain_name, 0x1c,
+                                lp_netbios_name(), 0, domain_name, 0x1c,
                                 dc_ss, dgm_id, p);
 fail:
@@ -228 +230 @@
         blob = p.smb.body.trans.data;
 
-        r = TALLOC_ZERO_P(mem_ctx, struct netlogon_samlogon_response);
+        r = talloc_zero(mem_ctx, struct netlogon_samlogon_response);
         if (!r) {
                 return false;
@@ -323 +325 @@
         }
         state->my_mailslot = mailslot_name(
-                state, ((struct sockaddr_in *)dc_addr)->sin_addr);
+                state, ((const struct sockaddr_in *)dc_addr)->sin_addr);
         if (tevent_req_nomem(state->my_mailslot, req)) {
                 return tevent_req_post(req, ev);
         }
-        state->nmbd_pid = pidfile_pid("nmbd");
+        state->nmbd_pid = pidfile_pid(lp_pid_directory(), "nmbd");
         if (state->nmbd_pid == 0) {
                 DEBUG(3, ("No nmbd found\n"));
@@ -452 +454 @@
         NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-        ev = tevent_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 goto fail;