Changeset 740 for vendor/current/source3/lib/eventlog

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source3/lib/eventlog

Files:

• eventlog.c (modified) (8 diffs)
• eventlog.h (added)
• proto.h (added)

vendor/current/source3/lib/eventlog/eventlog.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "lib/eventlog/eventlog.h"
+#include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 /* maintain a list of open eventlog tdbs with reference counts */
@@ -66 +70 @@
 char *elog_tdbname(TALLOC_CTX *ctx, const char *name )
 {
-        char *path = talloc_asprintf(ctx, "%s/%s.tdb",
-                        state_path("eventlog"),
-                        name);
+        char *path;
+        char *file;
+        char *tdbname;
+
+        path = talloc_strdup(ctx, state_path("eventlog"));
         if (!path) {
                 return NULL;
         }
-        strlower_m(path);
-        return path;
+
+        file = talloc_asprintf_strlower_m(path, "%s.tdb", name);
+        if (!file) {
+                talloc_free(path);
+                return NULL;
+        }
+
+        tdbname = talloc_asprintf(path, "%s/%s", state_path("eventlog"), file);
+        if (!tdbname) {
+                talloc_free(path);
+                return NULL;
+        }
+
+        return tdbname;
 }
 
@@ -677 +695 @@
         blob = data_blob_const(data.dptr, data.dsize);
 
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, r,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, r,
                            (ndr_pull_flags_fn_t)ndr_pull_eventlog_Record_tdb);
 
@@ -727 +745 @@
         }
 
-        r->Length = r->Length2 = ndr_size_EVENTLOGRECORD(r, NULL, 0);
+        r->Length = r->Length2 = ndr_size_EVENTLOGRECORD(r, 0);
 
         return r;
@@ -771 +789 @@
         r->record_number = tdb_fetch_int32(tdb, EVT_NEXT_RECORD);
 
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, r,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, r,
                       (ndr_push_flags_fn_t)ndr_push_eventlog_Record_tdb);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -941 +959 @@
                 }
                 if (len > 0) {
-                        e->UserSid = *string_sid_talloc(mem_ctx, sid_str);
+                        string_to_sid(&e->UserSid, sid_str);
                 }
         }
@@ -993 +1011 @@
                 }
 
-                endoffset += ndr_size_EVENTLOGRECORD(&e, NULL, 0);
+                endoffset += ndr_size_EVENTLOGRECORD(&e, 0);
 
                 ADD_TO_ARRAY(mem_ctx, struct EVENTLOGRECORD, e, &evt.records, &num_records);
@@ -1020 +1038 @@
         }
 
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, &evt,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, &evt,
                    (ndr_push_flags_fn_t)ndr_push_EVENTLOG_EVT_FILE);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {